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

Merge branch 'develop' into encryption-rework

Browse source 
Conflicts:
  jrnl/output.py
  jrnl/prompt.py
This commit is contained in:
Jonathan Wren 2022-11-05 15:53:04 -07:00
commit dcdee69117
No known key found for this signature in database
37 changed files with 381 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/bdd/features/encrypt.feature
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>"