diff --git a/features/core.feature b/features/core.feature index 6f4787cb..c1e6a004 100644 --- a/features/core.feature +++ b/features/core.feature @@ -136,14 +136,14 @@ Feature: Basic reading and writing to a journal Then the output should contain "jrnl" And the output should contain "Python" - Scenario: --import allows new entry to journal + Scenario: --import allows new entry from stdin Given we use the config "basic.yaml" When we run "jrnl --import" and pipe "[2020-07-05 15:00] Observe and import." And we run "jrnl -1" Then the journal should contain "[2020-07-05 15:00] Observe and import." And the output should contain "Observe and import" - Scenario: --import allows new large entry to journal + Scenario: --import allows new large entry from stdin Given we use the config "basic.yaml" When we run "jrnl --import" and pipe """ @@ -161,7 +161,7 @@ Feature: Basic reading and writing to a journal And the output should contain "Lorem ipsum" And the output should contain "end of entry." - Scenario: --import allows import of multiple entries to journal + Scenario: --import allows multiple new entries from stdin Given we use the config "basic.yaml" When we run "jrnl --import" and pipe """ @@ -173,3 +173,28 @@ Feature: Basic reading and writing to a journal """ Then the journal should contain "[2020-07-05 15:00] Observe and import." Then the journal should contain "[2020-07-05 15:01] Twice as nice." + + Scenario: --import allows import new entries from file + Given we use the config "basic.yaml" + Then the journal should contain "My first entry." + And the journal should contain "Life is good." + But the journal should not contain "I have an @idea" + And the journal should not contain "I met with" + When we run "jrnl --import -i features/journals/tags.journal" + Then the journal should contain "My first entry." + And the journal should contain "Life is good." + And the journal should contain "PROFIT!" + + Scenario: --import doesn't get confused with piping and file + Given we use the config "basic.yaml" + Then the journal should contain "My first entry." + And the journal should contain "Life is good." + But the journal should not contain "I have an @idea" + And the journal should not contain "I met with" + When we run "jrnl --import -i features/journals/tags.journal" and pipe + """ + [2020-07-05 15:00] I should not exist! + """ + Then the journal should contain "My first entry." + And the journal should contain "PROFITS!" + But the journal should not contain "I should not exist!"