Merge branch 'develop' into directory-journal-config-encrypt

# Conflicts:
#	tests/bdd/features/encrypt.feature
This commit is contained in:
Micah Jerome Ellison 2021-08-21 13:51:14 -07:00
commit 248c6ddf2a
7 changed files with 40 additions and 2 deletions

View file

@ -28,15 +28,30 @@ Feature: Encrypting and decrypting journals
# This should warn the user that the journal is already encrypted
Scenario: Encrypting a journal
Scenario Outline: Encrypting a journal
Given we use the config "simple.yaml"
When we run "jrnl --encrypt" and enter
swordfish
swordfish
n
Then we should see the message "Journal encrypted"
Then we should get no error
And we should see the message "Journal encrypted"
And the config for journal "default" should contain "encrypt: true"
When we run "jrnl -n 1" and enter "swordfish"
Then we should be prompted for a password
And the output should contain "2013-06-10 15:40 Life is good"
Examples: configs
| config_file |
| basic_onefile.yaml |
Scenario Outline: Attempt to encrypt a folder or DayOne journal should result in an error
Given we use the config "<config_file>"
When we run "jrnl --encrypt"
Then the error output should contain "can't be encrypted"
Examples: configs
| config_file |
| basic_folder.yaml |
| basic_dayone.yaml |