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

Implement step for directory journals

Browse source 
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
This commit is contained in:
Micah Jerome Ellison 2021-05-15 14:50:49 -07:00 • committed by Jonathan Wren
parent 4aabb73847
commit ef25c50e16
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/step_defs/conftest.py
View file

@ -31,6 +31,7 @@ import toml
from jrnl import __version__ from jrnl import __version__
from jrnl.cli import cli from jrnl.cli import cli
from jrnl.config import load_config from jrnl.config import load_config
from jrnl.config import scope_config
from jrnl.os_compat import split_args from jrnl.os_compat import split_args
from jrnl.os_compat import on_windows from jrnl.os_compat import on_windows
from jrnl.time import __get_pdt_calendar from jrnl.time import __get_pdt_calendar
@ -112,6 +113,13 @@ def read_value_from_string(string):
value = {"bool": lambda v: v.lower() == "true", "int": int, "str": str}[t](value) value = {"bool": lambda v: v.lower() == "true", "int": int, "str": str}[t](value)
return value return value
def assert_directory_contains_files(file_list, directory_path):
assert os.path.isdir(directory_path), "Directory path is not a directory"
for file in file_list.split("\n"):
fullpath = directory_path + '/' + file
assert os.path.isfile(fullpath)
# ----- FIXTURES ----- # # ----- FIXTURES ----- #
@fixture @fixture
@ -358,6 +366,7 @@ def we_run(
cache_dir, cache_dir,
editor, editor,
now_date, now_date,
keyring
): ):
if cache_dir["exists"]: if cache_dir["exists"]:
command = command.format(cache_dir=cache_dir["path"]) command = command.format(cache_dir=cache_dir["path"])
@ -527,15 +536,17 @@ def password_was_not_called(cli_run):
@then(parse("the cache directory should contain the files\n{file_list}")) @then(parse("the cache directory should contain the files\n{file_list}"))
def assert_dir_contains_files(file_list, cache_dir): def assert_dir_contains_files(file_list, cache_dir):
actual_files = os.listdir(cache_dir["path"]) assert_directory_contains_files(file_list, cache_dir["path"])
expected_files = file_list.split("\n")
# sort to deal with inconsistent default file ordering on different OS's @then(parse("the journal directory should contain\n{file_list}"))
actual_files.sort() def journal_directory_should_contain(config_data, file_list, journal_name):
expected_files.sort() if not journal_name:
journal_name = "default"
assert actual_files == expected_files, [actual_files, expected_files] scoped_config = scope_config(config_data, journal_name)
journal_path = scoped_config["journal"]
assert_directory_contains_files(file_list, journal_path)
@given("we create a cache directory", target_fixture="cache_dir") @given("we create a cache directory", target_fixture="cache_dir")
def create_cache_dir(temp_dir): def create_cache_dir(temp_dir):
@ -706,3 +717,4 @@ def count_elements(number, item, cli_run):
actual_output = cli_run["stdout"] actual_output = cli_run["stdout"]
xml_tree = ElementTree.fromstring(actual_output) xml_tree = ElementTree.fromstring(actual_output)
assert len(xml_tree.findall(".//" + item)) == number assert len(xml_tree.findall(".//" + item)) == number