mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-20 04:58:32 +02:00
make format
This commit is contained in:
parent
263c79cea6
commit
77646eaa1a
2 changed files with 47 additions and 40 deletions
|
@ -212,16 +212,16 @@ def open_editor_and_enter(context, method, text=""):
|
|||
|
||||
# fmt: on
|
||||
|
||||
|
||||
@then("the editor {editor} should have been called")
|
||||
def editor_override(context, editor):
|
||||
|
||||
def _mock_editor(command_and_journal_file):
|
||||
editor = command_and_journal_file[0]
|
||||
context.tmpfile = command_and_journal_file[-1]
|
||||
print("%s has been launched"%editor)
|
||||
tmpfile = command_and_journal_file[-1]
|
||||
context.tmpfile = tmpfile
|
||||
print("%s has been launched" % editor)
|
||||
return tmpfile
|
||||
|
||||
try :
|
||||
# fmt: off
|
||||
# see: https://github.com/psf/black/issues/664
|
||||
with \
|
||||
|
@ -231,12 +231,15 @@ def editor_override(context, editor):
|
|||
patch("jrnl.config.get_config_path", side_effect=lambda: context.config_path), \
|
||||
patch("jrnl.install.get_config_path", side_effect=lambda: context.config_path) \
|
||||
:
|
||||
try :
|
||||
cli(['--override','{"editor": "%s"}'%editor])
|
||||
context.exit_status = 0
|
||||
context.editor = mock_editor
|
||||
assert mock_editor.assert_called_once_with(editor, context.tmpfile)
|
||||
except SystemExit as e:
|
||||
context.exit_status = e.code
|
||||
# fmt: on
|
||||
|
||||
|
||||
@then("the editor should have been called")
|
||||
@then("the editor should have been called with {num} arguments")
|
||||
|
|
|
@ -15,28 +15,28 @@ def minimal_config():
|
|||
cfg = yaml.load(cfg_file.read())
|
||||
yield cfg
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def expected_override(minimal_config):
|
||||
exp_out_cfg = minimal_config.copy()
|
||||
exp_out_cfg['editor'] = 'nano'
|
||||
exp_out_cfg['journal'] = 'features/journals/simple.journal'
|
||||
exp_out_cfg["editor"] = "nano"
|
||||
exp_out_cfg["journal"] = "features/journals/simple.journal"
|
||||
yield exp_out_cfg
|
||||
|
||||
|
||||
from jrnl import jrnl
|
||||
|
||||
|
||||
|
||||
@mock.patch('sys.stdin.isatty')
|
||||
@mock.patch("sys.stdin.isatty")
|
||||
@mock.patch.object(install, "load_or_install_jrnl")
|
||||
@mock.patch('subprocess.call')
|
||||
@mock.patch("subprocess.call")
|
||||
def test_override_configured_editor(
|
||||
mock_subprocess_call,
|
||||
mock_load_or_install,
|
||||
mock_isatty,
|
||||
minimal_config,
|
||||
expected_override,
|
||||
capsys
|
||||
capsys,
|
||||
):
|
||||
mock_load_or_install.return_value = minimal_config
|
||||
mock_isatty.return_value = True
|
||||
|
@ -44,11 +44,15 @@ def test_override_configured_editor(
|
|||
cli_args = ["--override", '{"editor": "nano"}']
|
||||
parser = parse_args(cli_args)
|
||||
assert parser.config_override.__len__() == 1
|
||||
|
||||
def mock_editor_launch(editor):
|
||||
print("%s launched! Success!"%editor)
|
||||
with mock.patch.object(jrnl,'_write_in_editor', side_effect=mock_editor_launch(parser.config_override['editor']), return_value = 'note_contents') as mock_write_in_editor:
|
||||
print("%s launched! Success!" % editor)
|
||||
|
||||
with mock.patch.object(
|
||||
jrnl,
|
||||
"_write_in_editor",
|
||||
side_effect=mock_editor_launch(parser.config_override["editor"]),
|
||||
return_value="note_contents",
|
||||
) as mock_write_in_editor:
|
||||
run(parser)
|
||||
mock_write_in_editor.assert_called_once_with(expected_override)
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue