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

Merge branch 'develop' into encryption-rework

Browse source
This commit is contained in:
Jonathan Wren 2022-10-08 16:00:19 -07:00
commit a9f57a0ce9
9 changed files with 49 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/lib/then_steps.py
View file

@ -118,7 +118,7 @@ def output_should_be_columns_wide(cli_run, width):
)
)
def default_journal_location(journal_file, journal_dir, config_on_disk, temp_dir):
default_journal_path = config_on_disk["journals"]["default"]
default_journal_path = config_on_disk["journals"]["default"]["journal"]
expected_journal_path = (
os.path.join(temp_dir.name, journal_file)
if journal_dir == "."