From cda07bf8d925653845f930708cc122a0e26b07c8 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 24 Apr 2021 15:44:29 -0700 Subject: [PATCH] Make steps use new config file Co-authored-by: Micah Jerome Ellison --- tests/features/import.feature | 4 +-- tests/features/upgrade.feature | 62 ++++++++++++---------------------- 2 files changed, 24 insertions(+), 42 deletions(-) diff --git a/tests/features/import.feature b/tests/features/import.feature index ef2e62d0..9de8e216 100644 --- a/tests/features/import.feature +++ b/tests/features/import.feature @@ -32,7 +32,7 @@ Feature: Importing data And the output should contain "end of entry." Examples: Configs - | config | + | config_file | | basic_onefile.yaml | | basic_encrypted.yaml | # | basic_folder.yaml | @todo @@ -54,7 +54,7 @@ Feature: Importing data And the output should contain "Sed dignissim" Examples: Configs - | config | + | config_file | | basic_onefile.yaml | | basic_encrypted.yaml | # | basic_folder.yaml | @todo diff --git a/tests/features/upgrade.feature b/tests/features/upgrade.feature index fda47363..115eb8ff 100644 --- a/tests/features/upgrade.feature +++ b/tests/features/upgrade.feature @@ -3,24 +3,20 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x Scenario: Upgrade and parse journals with square brackets Given we use the config "upgrade_from_195.json" When we run "jrnl -9" and enter "Y" - Then the journal should have 2 entries + When we run "jrnl -99 --short" + Then the output should be + @todo something And the output should contain - """ - 2010-06-10 15:00 A life without chocolate is like a bad analogy. - """ + 2010-06-10 15:00 A life without chocolate is like a bad analogy. And the output should contain - """ - 2013-06-10 15:40 He said "[this] is the best time to be alive". - """ + 2013-06-10 15:40 He said "[this] is the best time to be alive". Scenario: Upgrading a journal encrypted with jrnl 1.x Given we use the config "encrypted_old.json" When we run "jrnl -n 1" and enter - """ - Y - bad doggie no biscuit - bad doggie no biscuit - """ + Y + bad doggie no biscuit + bad doggie no biscuit Then we should be prompted for a password And the output should contain "2013-06-10 15:40 Life is good" @@ -28,44 +24,30 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x Given we use the config "no_colors.yaml" When we run "jrnl -n 1" Then the config should have "colors" set to - """ - { - 'date':'none', - 'title':'none', - 'body':'none', - 'tags':'none' - } - """ + date: none + title: none + body: none + tags: none Scenario: Upgrade and parse journals with little endian date format Given we use the config "upgrade_from_195_little_endian_dates.json" When we run "jrnl -9" and enter "Y" - Then the journal should have 2 entries - And the output should contain - """ - 10.06.2010 15:00 A life without chocolate is like a bad analogy. - """ - And the output should contain - """ - 10.06.2013 15:40 He said "[this] is the best time to be alive". - """ + Then the output should be + 10.06.2010 15:00 A life without chocolate is like a bad analogy. + 10.06.2013 15:40 He said "[this] is the best time to be alive". Scenario: Upgrade with missing journal Given we use the config "upgrade_from_195_with_missing_journal.json" - When we run "jrnl -ls" and enter - """" - Y - """ - Then the output should contain "Error: features/journals/missing.journal does not exist." + When we run "jrnl --list" and enter + Y + Then the error output should contain "Error: features/journals/missing.journal does not exist." And we should get no error Scenario: Upgrade with missing encrypted journal Given we use the config "upgrade_from_195_with_missing_encrypted_journal.json" - When we run "jrnl -ls" and enter - """ - Y - bad doggie no biscuit - """ - Then the output should contain "Error: features/journals/missing.journal does not exist." + When we run "jrnl --list" and enter + Y + bad doggie no biscuit + Then the error output should contain "Error: features/journals/missing.journal does not exist." And the error output should contain "We're all done" And we should get no error