Merge branch 'master' into 2.0-dayone-fixes

features/data/configs/brackets.yaml

@@ -0,0 +1,12 @@
+default_hour: 9
+default_minute: 0
+editor: ""
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/brackets.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"

features/data/configs/mostlyreadabledates.yaml

@@ -0,0 +1,12 @@
+default_hour: 9
+default_minute: 0
+editor: ""
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/mostlyreadabledates.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"

features/data/configs/unreadabledates.yaml

@@ -0,0 +1,12 @@
+default_hour: 9
+default_minute: 0
+editor: ""
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/unreadabledates.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"

features/data/journals/brackets.journal

@@ -0,0 +1,2 @@
+[2019-07-08 05:42] Entry subject
+[1] line starting with 1

features/data/journals/mostlyreadabledates.journal

@@ -0,0 +1,8 @@
+[2019-07-18 14:23] Entry subject
+Time machines are possible. I know, because I've built one in my garage.
+
+[2019-07-19 14:23] Entry subject
+I'm going to activate the machine. Nobody knows what comes next after this. Or before this?
+
+[2019-07 14:23] Entry subject
+I've crossed so many timelines. Is there any going back?

features/data/journals/unreadabledates.journal

@@ -0,0 +1,5 @@
+[ashasd7zdskhz7asdkjasd] Entry subject
+I've lost track of time.
+
+[sadfhakjsdf88sdf7sdff] Entry subject
+Time has no meaning.

features/regression.feature

@@ -72,3 +72,21 @@ Feature: Zapped bugs should stay dead.
             """
             2013-05-17 11:39 This entry has tags!
             """
+    Scenario: Integers in square brackets should not be read as dates 
+        Given we use the config "brackets.yaml"
+        When we run "jrnl -1"
+        Then the output should contain "[1] line starting with 1"
+
+    Scenario: Journals with unreadable dates should still be viewable 
+        Given we use the config "unreadabledates.yaml"
+        When we run "jrnl -2"
+        Then the output should contain "I've lost track of time."
+        Then the output should contain "Time has no meaning."
+
+    Scenario: Journals with readable dates AND unreadable dates should still contain all data.
+        Given we use the config "mostlyreadabledates.yaml"
+        When we run "jrnl -3"
+        Then the output should contain "Time machines are possible."
+        When we run "jrnl -1"
+        Then the output should contain "I'm going to activate the machine."
+        Then the output should contain "I've crossed so many timelines. Is there any going back?"