rebases are hard

This commit is contained in:
sriniv27 2021-02-18 08:56:58 -05:00
parent 289a307b26
commit 7564cfb381
2 changed files with 1 additions and 3 deletions

View file

@ -10,8 +10,7 @@ Feature: Implementing Runtime Overrides for Select Configuration Keys
Given We use the config "basic_encrypted.yaml"
And we use the password "test" if prompted
When we run "jrnl --decrypt --config-override highlight false --config-override editor nano"
Then the runtime config should have "encrypt" set to "false"
And the runtime config should have "highlight" set to "false"
Then the config should have "highlight" set to "bool:false"
And no editor should have been called
@skip_win

View file

@ -647,7 +647,6 @@ def config_var(context, key, value="", journal=None):
assert runtime_cfg == value
@then('the config for journal "{journal}" should not have "{key}" set')
def config_no_var(context, key, value="", journal=None):
configuration = load_config(context.config_path)