Merge branch 'moar-tests' of https://github.com/wren/jrnl into moar-tests

This commit is contained in:
Micah Jerome Ellison 2020-09-26 13:16:21 -07:00
commit fda3fe2357
4 changed files with 15 additions and 11 deletions

View file

@ -84,4 +84,3 @@ def after_scenario(context, scenario):
clean_all_working_dirs() clean_all_working_dirs()
else: else:
clean_all_working_dirs() clean_all_working_dirs()

View file

@ -109,7 +109,6 @@ Feature: Custom formats
####### ATX H4 ####### ATX H4
######## ATX H5 ######## ATX H5
######### ATX H6 ######### ATX H6

View file

@ -12,7 +12,6 @@ Feature: Using the installed keyring
Then the config for journal "simple" should have "encrypt" set to "bool:True" Then the config for journal "simple" should have "encrypt" set to "bool:True"
When we run "jrnl simple -n 1" When we run "jrnl simple -n 1"
Then the output should contain "2013-06-10 15:40 Life is good" Then the output should contain "2013-06-10 15:40 Life is good"
But the output should not contain "Password"
Scenario: Encrypt journal with no keyring backend and do not store in keyring Scenario: Encrypt journal with no keyring backend and do not store in keyring
Given we use the config "simple.yaml" Given we use the config "simple.yaml"
@ -37,6 +36,7 @@ Feature: Using the installed keyring
y y
""" """
Then we should get no error Then we should get no error
# @todo add step to check contents of keyring
@todo @todo
Scenario: Open an encrypted journal with wrong password in keyring Scenario: Open an encrypted journal with wrong password in keyring
@ -46,11 +46,15 @@ Feature: Using the installed keyring
Scenario: Open encrypted journal when keyring exists but fails Scenario: Open encrypted journal when keyring exists but fails
# This should ask the user for the password after the keyring fails # This should ask the user for the password after the keyring fails
Scenario: Loading an encrypted journal @todo
Given we use the config "encrypted.yaml" Scenario: Decrypt journal with password in keyring
When we run "jrnl -n 1" and enter "bad doggie no biscuit"
Then we should be prompted for a password @todo
And the output should contain "2013-06-10 15:40 Life is good" Scenario: Decrypt journal without a keyring
@todo
Scenario: Decrypt journal when keyring exists but fails
# This should ask the user for the password after the keyring fails
Scenario: Mistyping your password Scenario: Mistyping your password
Given we use the config "simple.yaml" Given we use the config "simple.yaml"

View file

@ -368,11 +368,13 @@ def flush_stderr(context):
@then("we flush all the output") @then("we flush all the output")
def flush_stderr(context): def flush_all_output(context):
context.execute_steps(''' context.execute_steps(
"""
Then we flush the output Then we flush the output
Then we flush the error output Then we flush the error output
''') """
)
@then("the output should be") @then("the output should be")