From 9f615191b4374eb8c850dca8dee1de6c4f903db2 Mon Sep 17 00:00:00 2001
From: Micah Ellison <4383304+micahellison@users.noreply.github.com>
Date: Sat, 25 Jan 2020 15:39:05 -0800
Subject: [PATCH 1/3] Prevent Travis from turning LF to CRLF in Windows

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 37dab626b..8219d49ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ cache:
 
 git:
   depth: false
+  autocrlf: false
 
 before_install:
   - date

From 25a7577f0b5d46acc57a32b2234ddab1ac733118 Mon Sep 17 00:00:00 2001
From: Micah Ellison <4383304+micahellison@users.noreply.github.com>
Date: Sat, 25 Jan 2020 15:40:05 -0800
Subject: [PATCH 2/3] Remove all skip_win directives now that Travis is not
 mangling newlines on Windows

---
 features/core.feature               | 1 -
 features/dayone_regressions.feature | 1 -
 features/encryption.feature         | 3 ---
 features/upgrade.feature            | 3 ---
 4 files changed, 8 deletions(-)

diff --git a/features/core.feature b/features/core.feature
index c023cd4ca..94da701ad 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -20,7 +20,6 @@ Feature: Basic reading and writing to a journal
         When we run "jrnl -n 1"
         Then the output should contain "2013-07-23 09:00 A cold and stormy day."
 
-    @skip_win
     Scenario: Writing an empty entry from the editor
         Given we use the config "editor.yaml"
         When we open the editor and enter ""
diff --git a/features/dayone_regressions.feature b/features/dayone_regressions.feature
index f6098ba6b..62c8cc247 100644
--- a/features/dayone_regressions.feature
+++ b/features/dayone_regressions.feature
@@ -24,7 +24,6 @@ Feature: Zapped Dayone bugs stay dead!
             | I'm feeling sore because I forgot to stretch.
             """
 
-    @skip_win
     Scenario: Opening an folder that's not a DayOne folder gives a nice error message
         Given we use the config "empty_folder.yaml"
         When we run "jrnl Herro"
diff --git a/features/encryption.feature b/features/encryption.feature
index 081a208ff..787fa850f 100644
--- a/features/encryption.feature
+++ b/features/encryption.feature
@@ -12,7 +12,6 @@
             Then we should see the message "Journal decrypted"
             And the journal should have 2 entries
 
-        @skip_win
         Scenario: Encrypting a journal
             Given we use the config "basic.yaml"
             When we run "jrnl --encrypt" and enter
@@ -27,7 +26,6 @@
             Then the output should contain "Password"
             And the output should contain "2013-06-10 15:40 Life is good"
 
-        @skip_win
         Scenario: Mistyping your password
             Given we use the config "basic.yaml"
             When we run "jrnl --encrypt" and enter
@@ -45,7 +43,6 @@
             Then the output should contain "Password"
             And the output should contain "2013-06-10 15:40 Life is good"
 
-        @skip_win
         Scenario: Storing a password in Keychain
             Given we use the config "multiple.yaml"
             When we run "jrnl simple --encrypt" and enter
diff --git a/features/upgrade.feature b/features/upgrade.feature
index b2c569c79..ef597d4f5 100644
--- a/features/upgrade.feature
+++ b/features/upgrade.feature
@@ -1,6 +1,5 @@
 Feature: Upgrading Journals from 1.x.x to 2.x.x
 
-    @skip_win
     Scenario: Upgrade and parse journals with square brackets
         Given we use the config "upgrade_from_195.json"
         When we run "jrnl -9" and enter "Y"
@@ -12,7 +11,6 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x
             """
         Then the journal should have 2 entries
 
-    @skip_win
     Scenario: Upgrading a journal encrypted with jrnl 1.x
         Given we use the config "encrypted_old.json"
         When we run "jrnl -n 1" and enter
@@ -24,7 +22,6 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x
         Then the output should contain "Password"
         and the output should contain "2013-06-10 15:40 Life is good"
 
-    @skip_win
     Scenario: Upgrade and parse journals with little endian date format
         Given we use the config "upgrade_from_195_little_endian_dates.json"
         When we run "jrnl -9" and enter "Y"

From 9cc8539ff94ea18b9d6249b554aedf6de695bdae Mon Sep 17 00:00:00 2001
From: Micah Ellison <4383304+micahellison@users.noreply.github.com>
Date: Sat, 25 Jan 2020 15:57:58 -0800
Subject: [PATCH 3/3] Keep skip_win directive for empty entry test that still
 stalls on Travis

---
 features/core.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/core.feature b/features/core.feature
index 94da701ad..c023cd4ca 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -20,6 +20,7 @@ Feature: Basic reading and writing to a journal
         When we run "jrnl -n 1"
         Then the output should contain "2013-07-23 09:00 A cold and stormy day."
 
+    @skip_win
     Scenario: Writing an empty entry from the editor
         Given we use the config "editor.yaml"
         When we open the editor and enter ""