From 618c0007572777a59ef607e92c177fdbb14d37f5 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 25 Feb 2023 13:20:24 -0800 Subject: [PATCH] fix failing test after merge conflict --- tests/bdd/features/install.feature | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/bdd/features/install.feature b/tests/bdd/features/install.feature index e352b905..44c36814 100644 --- a/tests/bdd/features/install.feature +++ b/tests/bdd/features/install.feature @@ -77,16 +77,19 @@ Feature: Installing jrnl Scenario: Install jrnl with encrypted default journal with no entries Given we use no config - And we use the password "test" if prompted When we run "jrnl -1" and enter encrypted.txt y n + test + test + n Then the error output should contain "Journal will be encrypted" And the default journal "encrypted.txt" should be in the "." directory And the config should contain "encrypt: true" And the version in the config file should be up-to-date - When we run "jrnl -1" + When we run "jrnl -1" and enter + test Then we should be prompted for a password And the error output should contain "no entries found" And the error output should not contain "Wrong password, try again"