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

Use mocks and context.config_path to store test configs - many tests still broken though

Browse source
This commit is contained in:
Micah Jerome Ellison 2020-12-05 15:34:32 -08:00
parent 0e57890f0d
commit fa01014db4
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
features/steps/core.py
View file

@ -17,6 +17,7 @@ import yaml
from jrnl import Journal from jrnl import Journal
from jrnl import __version__ from jrnl import __version__
from jrnl import plugins from jrnl import plugins
from jrnl import config
from jrnl.cli import cli from jrnl.cli import cli
from jrnl.config import load_config from jrnl.config import load_config
from jrnl.os_compat import on_windows from jrnl.os_compat import on_windows
@ -91,24 +92,24 @@ def ushlex(command):
def read_journal(context, journal_name="default"): def read_journal(context, journal_name="default"):
config = load_config(context.config_path) configuration = load_config(context.config_path)
with open(config["journals"][journal_name]) as journal_file: with open(configuration["journals"][journal_name]) as journal_file:
journal = journal_file.read() journal = journal_file.read()
return journal return journal
def open_journal(context, journal_name="default"): def open_journal(context, journal_name="default"):
config = load_config(context.config_path) configuration = load_config(context.config_path)
journal_conf = config["journals"][journal_name] journal_conf = configuration["journals"][journal_name]
# We can override the default config on a by-journal basis # We can override the default config on a by-journal basis
if type(journal_conf) is dict: if type(journal_conf) is dict:
config.update(journal_conf) configuration.update(journal_conf)
# But also just give them a string to point to the journal file # But also just give them a string to point to the journal file
else: else:
config["journal"] = journal_conf configuration["journal"] = journal_conf
return Journal.open_journal(journal_name, config) return Journal.open_journal(journal_name, configuration)
def read_value_from_string(string): def read_value_from_string(string):
@ -126,7 +127,6 @@ def read_value_from_string(string):
def set_config(context, config_file): def set_config(context, config_file):
full_path = os.path.join("features/configs", config_file) full_path = os.path.join("features/configs", config_file)
# patch("config.get_config_path", side_effect=absolute_path)
context.config_path = os.path.abspath(full_path) context.config_path = os.path.abspath(full_path)
if config_file.endswith("yaml") and os.path.exists(full_path): if config_file.endswith("yaml") and os.path.exists(full_path):
@ -303,7 +303,7 @@ def run_with_input(context, command, inputs=""):
patch("getpass.getpass", side_effect=_mock_getpass(password)) as mock_getpass, \ patch("getpass.getpass", side_effect=_mock_getpass(password)) as mock_getpass, \
patch("sys.stdin.read", side_effect=text) as mock_read, \ patch("sys.stdin.read", side_effect=text) as mock_read, \
patch("subprocess.call", side_effect=_mock_editor) as mock_editor, \ patch("subprocess.call", side_effect=_mock_editor) as mock_editor, \
patch("config.get_config_path", side_effect=context.config_path) \ patch("jrnl.config.get_config_path", side_effect=context.config_path) \
: :
try: try:
cli(args or []) cli(args or [])
@ -386,7 +386,7 @@ def run(context, command, text=""):
patch("getpass.getpass", side_effect=_mock_getpass(password)) as mock_getpass, \ patch("getpass.getpass", side_effect=_mock_getpass(password)) as mock_getpass, \
patch("subprocess.call", side_effect=_mock_editor) as mock_editor, \ patch("subprocess.call", side_effect=_mock_editor) as mock_editor, \
patch("sys.stdin.read", side_effect=lambda: text), \ patch("sys.stdin.read", side_effect=lambda: text), \
patch("config.get_config_path", side_effect=context.config_path) \ patch("jrnl.config.get_config_path", side_effect=context.config_path) \
: :
context.editor = mock_editor context.editor = mock_editor
context.getpass = mock_getpass context.getpass = mock_getpass
@ -548,18 +548,18 @@ def check_not_journal_content(context, text, journal_name="default"):
@then("the journal should not exist") @then("the journal should not exist")
@then('journal "{journal_name}" should not exist') @then('journal "{journal_name}" should not exist')
def journal_doesnt_exist(context, journal_name="default"): def journal_doesnt_exist(context, journal_name="default"):
config = load_config(context.config_path) configuration = load_config(context.config_path)
journal_path = config["journals"][journal_name] journal_path = configuration["journals"][journal_name]
assert not os.path.exists(journal_path) assert not os.path.exists(journal_path)
@then("the journal should exist") @then("the journal should exist")
@then('journal "{journal_name}" should exist') @then('journal "{journal_name}" should exist')
def journal_exists(context, journal_name="default"): def journal_exists(context, journal_name="default"):
config = load_config(context.config_path) configuration = load_config(context.config_path)
journal_path = config["journals"][journal_name] journal_path = configuration["journals"][journal_name]
assert os.path.exists(journal_path) assert os.path.exists(journal_path)
@ -568,23 +568,23 @@ def journal_exists(context, journal_name="default"):
@then('the config for journal "{journal}" should have "{key}" set to "{value}"') @then('the config for journal "{journal}" should have "{key}" set to "{value}"')
def config_var(context, key, value="", journal=None): def config_var(context, key, value="", journal=None):
value = read_value_from_string(value or context.text or "") value = read_value_from_string(value or context.text or "")
config = load_config(context.config_path) configuration = load_config(context.config_path)
if journal: if journal:
config = config["journals"][journal] configuration = configuration["journals"][journal]
assert key in config assert key in config
assert config[key] == value assert configuration[key] == value
@then('the config for journal "{journal}" should not have "{key}" set') @then('the config for journal "{journal}" should not have "{key}" set')
def config_no_var(context, key, value="", journal=None): def config_no_var(context, key, value="", journal=None):
config = load_config(context.config_path) configuration = load_config(context.config_path)
if journal: if journal:
config = config["journals"][journal] configuration = configuration["journals"][journal]
assert key not in config assert key not in configuration
@then("the journal should have {number:d} entries") @then("the journal should have {number:d} entries")
@ -599,8 +599,8 @@ def check_journal_entries(context, number, journal_name="default"):
@when("the journal directory is listed") @when("the journal directory is listed")
def list_journal_directory(context, journal="default"): def list_journal_directory(context, journal="default"):
with open(context.config_path) as config_file: with open(context.config_path) as config_file:
config = yaml.load(config_file, Loader=yaml.FullLoader) configuration = yaml.load(config_file, Loader=yaml.FullLoader)
journal_path = config["journals"][journal] journal_path = configuration["journals"][journal]
for root, dirnames, f in os.walk(journal_path): for root, dirnames, f in os.walk(journal_path):
for file in f: for file in f:
print(os.path.join(root, file)) print(os.path.join(root, file))