From 7564cfb3815455fc2a2486c8fdc763b57528cda4 Mon Sep 17 00:00:00 2001 From: sriniv27 Date: Thu, 18 Feb 2021 08:56:58 -0500 Subject: [PATCH] rebases are hard --- features/overrides.feature | 3 +-- features/steps/core.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/features/overrides.feature b/features/overrides.feature index ffeff040..09a27b23 100644 --- a/features/overrides.feature +++ b/features/overrides.feature @@ -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 diff --git a/features/steps/core.py b/features/steps/core.py index cf75d099..f471acfb 100644 --- a/features/steps/core.py +++ b/features/steps/core.py @@ -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)