fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-04 07:26:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into update-tzlocal-1528

Browse source 
Conflicts:
  poetry.lock
This commit is contained in:
Jonathan Wren 2022-07-30 12:45:57 -07:00
commit 2432a408fc
6 changed files with 75 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/bdd/features/config_file.feature
View file

@ -107,6 +107,16 @@ Feature: Multiple journals
When we run "jrnl --cf empty_file.yaml"
Then the error output should contain "Unable to parse config file"
Scenario: Use a config file with linewrap set to 'auto'
Given we use the config "linewrap_auto.yaml"
When we run "jrnl -1"
Then the output should contain "Life is good."
Scenario: Use a config file with linewrap set to 'auto' and use format 'fancy'
Given we use the config "linewrap_auto.yaml"
When we run "jrnl -1 --format fancy"
Then the output should contain "Life is good."
Scenario: Show a warning message when the config file contains duplicate keys at the same level
Given the config "duplicate_keys.yaml" exists
And we use the config "duplicate_keys.yaml"
@ -122,4 +132,4 @@ Feature: Multiple journals
Scenario: Don't show a duplicate keys warning message when using --config-override on an existing value
Given we use the config "multiple.yaml"
When we run "jrnl --config-override highlight false"
Then the output should not contain "There is at least one duplicate key in your configuration file"
Then the output should not contain "There is at least one duplicate key in your configuration file"