fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-17 19:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into ruamel

Browse source
This commit is contained in:
Micah Jerome Ellison 2022-03-12 13:15:21 -08:00
commit 9833ee9911
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/bdd/features/datetime.feature
View file

@ -83,6 +83,7 @@ Feature: Reading and writing to journal with custom date formats
Then the output should not contain "Life is good" Then the output should not contain "Life is good"
And the output should not contain "But I'm better." And the output should not contain "But I'm better."
Scenario Outline: Create entry using day of the week as entry date one. Scenario Outline: Create entry using day of the week as entry date one.
Given we use the config "simple.yaml" Given we use the config "simple.yaml"
And now is "2019-03-12 01:30:32 PM" And now is "2019-03-12 01:30:32 PM"
@ -172,3 +173,28 @@ Feature: Reading and writing to journal with custom date formats
Then we should get no error Then we should get no error
And the output should be And the output should be
2013-10-27 03:27 Some text. 2013-10-27 03:27 Some text.
@skip #1422
Scenario Outline: Using "tomorrow" near daylight savings works in Dayone journals
Given we use the config "dayone.yaml"
And now is "<date>"
When we run "jrnl yesterday: This thing happened yesterday"
Then the output should contain "Entry added"
When we run "jrnl today at 11:59pm: Adding an entry right now."
Then the output should contain "Entry added"
When we run "jrnl tomorrow: A future entry."
Then the output should contain "Entry added"
When we run "jrnl -from yesterday -to today"
Then the output should contain "This thing happened yesterday"
And the output should contain "Adding an entry right now."
And the output should not contain "A future entry."
Examples: Dates
| date |
| 2022-02-10 01:00:00 PM |
| 2021-03-13 01:00:00 PM |
| 2021-11-06 01:00:00 PM |
| 2022-03-12 01:00:00 PM |
| 2022-11-05 01:00:00 PM |

1
tests/bdd/features/search.feature
View file

@ -36,6 +36,7 @@ Feature: Searching in a journal
Scenario Outline: Displaying entries using -from and -to day should display correct entries Scenario Outline: Displaying entries using -from and -to day should display correct entries
Given we use the config "<config_file>" Given we use the config "<config_file>"
And now is "2022-03-10 02:32:00 PM"
When we run "jrnl yesterday: This thing happened yesterday" When we run "jrnl yesterday: This thing happened yesterday"
Then the output should contain "Entry added" Then the output should contain "Entry added"
When we run "jrnl today at 11:59pm: Adding an entry right now." When we run "jrnl today at 11:59pm: Adding an entry right now."