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

Merge branch 'develop' into encryption-rework

Browse source 
Conflicts:
jrnl/output.py
This commit is contained in:
Jonathan Wren 2022-10-01 12:45:32 -07:00
commit 44cafe6c16
6 changed files with 64 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/bdd/features/format.feature
View file

@ -597,3 +597,18 @@ Feature: Custom formats
When we run "jrnl --format text --file {cache_dir}"
Then the cache directory should contain 5 files
And we should get no error
Scenario: Export journal list to multiple formats.
Given we use the config "basic_onefile.yaml"
When we run "jrnl --list"
Then the output should match
Journals defined in config \(.+basic_onefile\.yaml\)
\* default -> features/journals/basic_onefile\.journal
When we run "jrnl --list --format json"
Then the output should match
{"config_path": ".+basic_onefile\.yaml", "journals": {"default": "features/journals/basic_onefile\.journal"}}
When we run "jrnl --list --format yaml"
Then the output should match
config_path: .+basic_onefile\.yaml
journals:
default: features/journals/basic_onefile\.journal

1
tests/lib/then_steps.py
View file

@ -23,6 +23,7 @@ def should_get_no_error(cli_run):
assert cli_run["status"] == 0, cli_run["status"]
@then(parse("the output should match\n{regex}"))
@then(parse('the output should match "{regex}"'))
def output_should_match(regex, cli_run):
out = cli_run["stdout"]