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

Merge branch 'develop' into pytest-bdd-6-1685

Browse source 
Conflicts:
poetry.lock
This commit is contained in:
Jonathan Wren 2023-02-25 14:59:56 -08:00
commit c6cef96c9d
No known key found for this signature in database
15 changed files with 1887 additions and 1486 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/bdd/features/install.feature
View file

@ -42,4 +42,19 @@ Feature: Installing jrnl
And the version in the config file should be up-to-date
When we run "jrnl"
Then we should be prompted for a password
Scenario: Install jrnl with encrypted default journal with no entries
Given we use no config
And we use the password "test" if prompted
When we run "jrnl -1" and enter
encrypted.txt
y
n
Then the error output should contain "Journal will be encrypted"
And the default journal "encrypted.txt" should be in the "." directory
And the config should contain "encrypt: true"
And the version in the config file should be up-to-date
When we run "jrnl -1"
Then we should be prompted for a password
And the error output should contain "no entries found"
And the error output should not contain "Wrong password, try again"

15
tests/bdd/features/template.feature
View file

@ -6,9 +6,12 @@ Feature: Using templates
Scenario Outline: Template contents should be used in new entry
Given we use the config "<config_file>"
And we use the password "test" if prompted
And we append to the editor if opened
This is an addition to a templated entry
When we run "jrnl --config-override template features/templates/basic.template"
And we run "jrnl -1"
Then the output should contain "This text is in the basic template"
Then the output should contain "This is an addition to a templated entry"
Examples: configs
| config_file |
@ -17,3 +20,15 @@ Feature: Using templates
| basic_folder.yaml |
| basic_dayone.yaml |
Scenario Outline: Templated entry should not be saved if template is unchanged
Given we use the config "<config_file>"
And we use the password "test" if prompted
When we run "jrnl --config-override template features/templates/basic.template"
Then the output should contain "No entry to save, because the template was not changed"
Examples: configs
| config_file |
| basic_onefile.yaml |
| basic_encrypted.yaml |
| basic_folder.yaml |
| basic_dayone.yaml |