Merge branch 'develop' into develop

tests/bdd/features/change_time.feature

@@ -25,13 +25,16 @@ Feature: Change entry times in journal
     Scenario Outline: Change flag changes prompted entries
         Given we use the config "<config_file>"
         And we use the password "test" if prompted
-        When we run "jrnl -1"
-        Then the output should contain "2020-09-24 09:14 The third entry finally"
+        When we run "jrnl --short"
+        Then the output should be
+            2020-08-29 11:11 Entry the first.
+            2020-08-31 14:32 A second entry in what I hope to be a long series.
+            2020-09-24 09:14 The third entry finally after weeks without writing.
         When we run "jrnl --change-time '2022-04-23 10:30'" and enter
             Y
             N
             Y
-        When we run "jrnl -99 --short"
+        When we run "jrnl --short"
         Then the output should be
             2020-08-31 14:32 A second entry in what I hope to be a long series.
             2022-04-23 10:30 Entry the first.

tests/bdd/features/file_storage.feature

@@ -57,6 +57,7 @@ Feature: Journals iteracting with the file system in a way that users can see
         When we run "jrnl hello world" and enter
             test.txt
             n
+            \n
         Then the output should contain "Journal 'default' created"
         When we change directory to "subfolder"
         And we run "jrnl -n 1"

tests/bdd/features/install.feature

@@ -5,7 +5,10 @@ Feature: Installing jrnl
         When we run "jrnl hello world" and enter
             \n
             \n
-        Then the output should contain "Journal 'default' created"
+            \n
+        Then the output should contain "jrnl configuration created at"
+        And the output should contain "For advanced features, read the docs at https://jrnl.sh"
+        And the output should contain "Journal 'default' created"
         And the default journal "journal.txt" should be in the "." directory
         And the config should contain "encrypt: false"
         And the version in the config file should be up-to-date
@@ -15,6 +18,7 @@ Feature: Installing jrnl
         When we run "jrnl hello world" and enter
             default/custom.txt
             n
+            \n
         Then the output should contain "Journal 'default' created"
         And the default journal "custom.txt" should be in the "default" directory
         And the config should contain "encrypt: false"
@@ -26,6 +30,7 @@ Feature: Installing jrnl
         When we run "jrnl hello world" and enter
             ~/custom.txt
             n
+            \n
         Then the output should contain "Journal 'default' created"
         And the default journal "custom.txt" should be in the "home" directory
         And the config should contain "encrypt: false"
@@ -36,10 +41,57 @@ Feature: Installing jrnl
         When we run "jrnl hello world" and enter
             encrypted.txt
             y
+            \n
         Then the 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"
         Then we should be prompted for a password
-    
+
+   Scenario: Install jrnl with colors by default
+        Given we use no config
+        When we run "jrnl hello world" and enter
+            \n
+            \n
+            \n
+        Then the output should contain "Journal 'default' created"
+        And the config should contain
+            colors:
+                body: none
+                date: black
+                tags: yellow
+                title: cyan
+
+   Scenario: Install jrnl without colors
+        Given we use no config
+        When we run "jrnl hello world" and enter
+            \n
+            \n
+            N
+        Then the output should contain "Journal 'default' created"
+        And the config should contain
+            colors:
+                body: none
+                date: none
+                tags: none
+                title: none
+
+    Scenario: Install jrnl with encrypted default journal with no entries
+        Given we use no config
+        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" 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"

tests/bdd/features/search.feature

@@ -124,6 +124,50 @@ Feature: Searching in a journal
         | basic_folder.yaml  |
         | basic_dayone.yaml  |
 
+
+    Scenario Outline: Searching for unstarred entries
+        Given we use the config "<config_file>"
+        And we use the password "test" if prompted
+        When we run "jrnl -not -starred"
+        Then we should get no error
+        And the output should contain "2 entries found"
+
+        Examples: configs
+        | config_file        |
+        | basic_onefile.yaml |
+        | basic_folder.yaml  |
+        | basic_dayone.yaml  |
+
+    Scenario Outline: Searching for tagged entries
+        Given we use the config "<config_file>"
+        And we use the password "test" if prompted
+        When we run "jrnl -tagged"
+        Then we should get no error
+        And the output should contain "3 entries found"
+
+        Examples: configs
+        | config_file        |
+        | basic_onefile.yaml |
+        | basic_folder.yaml  |
+        | basic_dayone.yaml  |
+
+    Scenario Outline: Searching for untagged entries
+        Given we use the config "empty_folder.yaml"
+        When we run "jrnl Tagged entry. This one has a @tag."
+        Then we should get no error
+        When we run "jrnl Untagged entry. This one has no tag."
+        Then we should get no error
+        When we run "jrnl -not -tagged"
+        Then we should get no error
+        And the output should contain "1 entry found"
+        And the output should contain "This one has no tag"
+
+        Examples: configs
+        | config_file        |
+        | basic_onefile.yaml |
+        | basic_folder.yaml  |
+        | basic_dayone.yaml  |
+
     Scenario Outline: Searching for dates
         Given we use the config "<config_file>"
         When we run "jrnl -on 2020-08-31 --short"

tests/bdd/features/template.feature

@@ -6,9 +6,12 @@ Feature: Using templates
     Scenario Outline: Template contents should be used in new entry
         Given we use the config "<config_file>"
         And we use the password "test" if prompted
+        And we append to the editor if opened
+            This is an addition to a templated entry
         When we run "jrnl --config-override template features/templates/basic.template"
         And we run "jrnl -1"
         Then the output should contain "This text is in the basic template"
+        Then the output should contain "This is an addition to a templated entry"
 
         Examples: configs
         | config_file          |
@@ -88,3 +91,4 @@ Feature: Using templates
         | basic_encrypted.yaml |
         | basic_folder.yaml    |
         | basic_dayone.yaml    |
+        | basic_dayone.yaml    |