diff --git a/features/overrides.feature b/features/overrides.feature index cdc30614..07aa45d2 100644 --- a/features/overrides.feature +++ b/features/overrides.feature @@ -2,17 +2,17 @@ Feature: Implementing Runtime Overrides for Select Configuration Keys Scenario: Override configured editor with built-in input === editor:'' Given we use the config "editor-args.yaml" -When we run "jrnl --override '{\"editor\": \"\""}'" +When we run "jrnl --config-override '{\"editor\": \"\""}'" Then the editor "" should have been called Scenario: Override configured editor with 'nano' Given we use the config "editor.yaml" -When we run "jrnl --override '{\"editor\": \"nano\"}'" +When we run "jrnl --config-override '{\"editor\": \"nano\"}'" Then the editor "nano" should have been called Scenario: Override configured linewrap with a value of 23 Given we use the config "editor.yaml" -When we run "jrnl -2 --override '{"linewrap": 23}' --format fancy" +When we run "jrnl -2 --config-override '{"linewrap": 23}' --format fancy" Then the output should be """ ┎─────╮2013-06-09 15:39 diff --git a/features/steps/core.py b/features/steps/core.py index bee060f7..2e037018 100644 --- a/features/steps/core.py +++ b/features/steps/core.py @@ -232,7 +232,7 @@ def editor_override(context, editor): patch("jrnl.install.get_config_path", side_effect=lambda: context.config_path) \ : try : - cli(['--override','{"editor": "%s"}'%editor]) + cli(['--config-override','{"editor": "%s"}'%editor]) context.exit_status = 0 context.editor = mock_editor assert mock_editor.assert_called_once_with(editor, context.tmpfile) diff --git a/jrnl/args.py b/jrnl/args.py index 61ffb4b2..efbe8138 100644 --- a/jrnl/args.py +++ b/jrnl/args.py @@ -320,7 +320,7 @@ def parse_args(args=[]): textwrap.dedent("These are one-off overrides of the config file options"), ) overrides.add_argument( - "--override", + "--config-override", dest="config_override", action="store", type=json.loads, @@ -331,7 +331,7 @@ def parse_args(args=[]): Override configured key-value pairs with CONFIG_KV_PAIR for this command invocation only. For example, to use a different editor for this jrnl entry, call: - jrnl --override '{"editor": "nano"}' + jrnl --config-override '{"editor": "nano"}' """, ) diff --git a/tests/test_config.py b/tests/test_config.py index 64c66b9f..f094313c 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -40,7 +40,7 @@ def test_override_configured_editor( mock_load_or_install.return_value = minimal_config mock_isatty.return_value = True - cli_args = ["--override", '{"editor": "nano"}'] + cli_args = ["--config-override", '{"editor": "nano"}'] parser = parse_args(cli_args) assert parser.config_override.__len__() == 1 diff --git a/tests/test_parse_args.py b/tests/test_parse_args.py index ee67ba65..5520e3d6 100644 --- a/tests/test_parse_args.py +++ b/tests/test_parse_args.py @@ -208,7 +208,7 @@ def test_version_alone(): def test_editor_override(): - assert cli_as_dict('--override \'{"editor": "nano"}\'') == expected_args( + assert cli_as_dict('--config-override \'{"editor": "nano"}\'') == expected_args( config_override={"editor": "nano"} )