fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 21:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FolderJournal path tests for Windows paths

Browse source
This commit is contained in:
Micah Ellison 2020-02-29 13:29:19 -08:00
parent 71f918d878
commit 8a4fe0ec81
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
features/folder.feature
View file

@ -15,7 +15,7 @@ Feature: Testing a journal with a root directory and multiple files in the forma
When we run "jrnl 23 July 2013: Testing folder journal." When we run "jrnl 23 July 2013: Testing folder journal."
Then we should see the message "Entry added" Then we should see the message "Entry added"
When the journal directory is listed When the journal directory is listed
Then the output should contain "2013/07/23.txt" Then the output should contain "2013/07/23.txt" or "2013\07\23.txt"
Scenario: Adding multiple entries to a Folder journal should generate multiple date files Scenario: Adding multiple entries to a Folder journal should generate multiple date files
@ -24,9 +24,8 @@ Feature: Testing a journal with a root directory and multiple files in the forma
And we run "jrnl 3/7/2014: Second entry of journal." And we run "jrnl 3/7/2014: Second entry of journal."
Then we should see the message "Entry added" Then we should see the message "Entry added"
When the journal directory is listed When the journal directory is listed
Then the output should contain "2013/07/23.txt" Then the output should contain "2013/07/23.txt" or "2013\07\23.txt"
And the output should contain "2014/03/07.txt" Then the output should contain "2014/03/07.txt" or "2014\03\07.txt"
Scenario: Out of order entries to a Folder journal should be listed in date order Scenario: Out of order entries to a Folder journal should be listed in date order
Given we use the config "empty_folder.yaml" Given we use the config "empty_folder.yaml"

5
features/steps/core.py
View file

@ -210,10 +210,11 @@ def check_output_time_inline(context, text):
@then("the output should contain") @then("the output should contain")
@then('the output should contain "{text}"') @then('the output should contain "{text}"')
def check_output_inline(context, text=None): @then('the output should contain "{text}" or "{text2}"')
def check_output_inline(context, text=None, text2=None):
text = text or context.text text = text or context.text
out = context.stdout_capture.getvalue() out = context.stdout_capture.getvalue()
assert text in out, text assert (text in out or text2 in out), text or text2
@then('the output should not contain "{text}"') @then('the output should not contain "{text}"')