Merge branch 'develop' into flake-simplify

Conflicts:
  poetry.lock
  pyproject.toml
This commit is contained in:
Jonathan Wren 2022-11-01 21:03:39 -07:00
commit fe1f447bd0
No known key found for this signature in database
9 changed files with 119 additions and 44 deletions

View file

@ -46,6 +46,22 @@ Feature: Encrypting and decrypting journals
Then we should be prompted for a password
And the output should contain "2013-06-10 15:40 Life is good"
Scenario: Encrypt journal twice and get prompted each time
Given we use the config "simple.yaml"
When we run "jrnl --encrypt" and enter
swordfish
swordfish
y
Then we should get no error
And the output should contain "Journal encrypted"
When we run "jrnl --encrypt" and enter
swordfish
swordfish
y
Then we should get no error
And the output should contain "Journal default is already encrypted. Create a new password."
And we should be prompted for a password
And the config for journal "default" should contain "encrypt: true"
Scenario Outline: Running jrnl with encrypt: true on unencryptable journals
Given we use the config "<config_file>"