From 590e0514794f2feab0adc7278c73f4c581bb2614 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Thu, 24 Sep 2020 20:54:13 -0700 Subject: [PATCH] update more delete flag tests to include other journal types --- features/delete.feature | 66 +++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/features/delete.feature b/features/delete.feature index 7ae8da27..fc886f3d 100644 --- a/features/delete.feature +++ b/features/delete.feature @@ -46,12 +46,16 @@ Feature: Delete entries from journal Scenario Outline: Delete flag with nonsense input deletes nothing (issue #932) - Given we use the config "deletion.yaml" - Then the journal should have 3 entries + Given we use the config ".yaml" When we run "jrnl --delete asdfasdf" - Then the journal should have 3 entries - When we run "jrnl -n 1" - Then the output should contain "2019-10-29 11:13 Third entry." + Then we flush the output + When we run "jrnl -99 --short" + Then the output should be + """ + 2020-08-29 11:11 Entry the first. + 2020-08-31 14:32 A second entry in what I hope to be a long series. + 2020-09-24 09:14 The third entry finally after weeks without writing. + """ Examples: Configs | config | @@ -59,34 +63,46 @@ Feature: Delete entries from journal | basic_folder | | basic_dayone | - Scenario: Delete flag with tag only deletes tagged entries - Given we use the config "deletion_filters.yaml" - Then the journal should have 5 entries - When we run "jrnl --delete @holidays" and enter + Scenario Outline: Delete flag with tag only deletes tagged entries + Given we use the config ".yaml" + When we run "jrnl --delete @ipsum" and enter """ Y - Y """ - Then the journal should have 3 entries - And the journal should contain "[2019-10-01 08:00] It's just another day in October." - And the journal should contain "[2020-03-01 08:00] It's just another day in March." - And the journal should contain "[2020-05-02 12:10] Writing tests." + Then we flush the output + When we run "jrnl -99 --short" + Then the output should be + """ + 2020-08-31 14:32 A second entry in what I hope to be a long series. + 2020-09-24 09:14 The third entry finally after weeks without writing. + """ - Scenario: Delete flag with multiple tags deletes all entries matching any of the tags - Given we use the config "deletion_filters.yaml" - Then the journal should have 5 entries - When we run "jrnl --delete @holidays @springtime" and enter + Examples: Configs + | config | + | basic_onefile | + # | basic_folder | @todo + # | basic_dayone | @todo + + + Scenario Outline: Delete flag with multiple tags deletes all entries matching any of the tags + Given we use the config ".yaml" + When we run "jrnl --delete @ipsum @tagthree" and enter """ Y Y - Y """ - Then the journal should have 2 entries - And the journal should contain "[2019-10-01 08:00] It's just another day in October." - And the journal should contain "[2020-03-01 08:00] It's just another day in March." - But the journal should not contain "[2020-01-01 08:00] Happy New Year!" - But the journal should not contain "[2020-05-01 09:00] Happy May Day!" - But the journal should not contain "[2020-05-02 12:10] Writing tests. *" + Then we flush the output + When we run "jrnl -99 --short" + Then the output should be + """ + 2020-08-31 14:32 A second entry in what I hope to be a long series. + """ + + Examples: Configs + | config | + | basic_onefile | + # | basic_folder | @todo + # | basic_dayone | @todo Scenario: Delete flag with -and deletes boolean AND of tagged entries Given we use the config "deletion_filters.yaml"