fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add more password tests to pytest-bdd

Browse source 
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
This commit is contained in:
Jonathan Wren 2021-03-06 13:35:42 -08:00
parent 10b604ef89
commit c76ee8cd4f
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/features/password.feature
View file

@ -77,3 +77,15 @@ Feature: Using the installed keyring
2013-06-09 15:39 My first entry. 2013-06-09 15:39 My first entry.
2013-06-10 15:40 Life is good. 2013-06-10 15:40 Life is good.
Scenario: Open encrypted journal when keyring exists but fails
# This should ask the user for the password after the keyring fails
Given we use the config "encrypted.yaml"
And we have a failed keyring
And we use the password "bad doggie no biscuit" if prompted
When we run "jrnl -n 1"
Then we should get no error
And we should be prompted for a password
And the output should contain "Failed to retrieve keyring"
And the output should contain "2013-06-10 15:40 Life is good"

26
tests/step_defs/conftest.py
View file

@ -149,8 +149,8 @@ def journal_name():
@fixture @fixture
def output_to_error(): def which_output_stream():
return False return None
# ----- STEPS ----- # # ----- STEPS ----- #
@ -256,13 +256,21 @@ def output_should_match(regex, cli_run):
@then(parse("the output should contain\n{output}")) @then(parse("the output should contain\n{output}"))
@then(parse('the output should contain "{output}"')) @then(parse('the output should contain "{output}"'))
@then('the output should contain "<output>"') @then('the output should contain "<output>"')
@then(parse("the {output_to_error} output should contain\n{output}")) @then(parse("the {which_output_stream} output should contain\n{output}"))
@then(parse('the {output_to_error} output should contain "{output}"')) @then(parse('the {which_output_stream} output should contain "{output}"'))
def output_should_contain(output, output_to_error, cli_run): def output_should_contain(output, which_output_stream, cli_run):
assert output and ( assert output
(output_to_error and output in cli_run["stderr"]) if which_output_stream is None:
or (not output_to_error and output in cli_run["stdout"]) assert (output in cli_run["stdout"]) or (output in cli_run["stderr"])
)
elif which_output_stream == "standard":
assert output in cli_run["stdout"]
elif which_output_stream == "error":
assert output in cli_run["stderr"]
else:
assert output in cli_run[which_output_stream]
@then(parse("the output should not contain\n{output}")) @then(parse("the output should not contain\n{output}"))