From 89e0bbc3fb46b4f17b619692dc87ecbd6e573e9e Mon Sep 17 00:00:00 2001
From: Micah Ellison <4383304+micahellison@users.noreply.github.com>
Date: Sat, 8 Feb 2020 13:26:44 -0800
Subject: [PATCH 1/2] Fix crashing unicode Travis tests on Windows and fail
 build if Windows tests fail

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af825d4f..0ddf4c61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,6 @@ jobs:
   fast_finish: true
   allow_failures:
     - python: nightly
-    - os: windows
 
   include:
     - name: Lint, via Black
@@ -74,6 +73,7 @@ jobs:
       env:
         - JRNL_PYTHON_VERSION=3.6.8
         - PATH=/c/Python36:/c/Python36/Scripts:$PATH
+        - PYTHONIOENCODING=UTF-8
 
     # Python 3.7 Tests
     - name: Python 3.7 on Linux
@@ -89,6 +89,7 @@ jobs:
       env:
         - JRNL_PYTHON_VERSION=3.7.5
         - PATH=/c/Python37:/c/Python37/Scripts:$PATH
+        - PYTHONIOENCODING=UTF-8
 
     # Python 3.8 Tests
     - name: Python 3.8 on Linux
@@ -104,6 +105,7 @@ jobs:
       env:
         - JRNL_PYTHON_VERSION=3.8.0
         - PATH=/c/Python38:/c/Python38/Scripts:$PATH
+        - PYTHONIOENCODING=UTF-8
 
     # ... and beyond!
     - name: Python nightly on Linux

From aaa2efddec9e0da2e8fcbabb0e2f7689eace2251 Mon Sep 17 00:00:00 2001
From: Micah Ellison <4383304+micahellison@users.noreply.github.com>
Date: Sat, 8 Feb 2020 13:54:39 -0800
Subject: [PATCH 2/2] Restore emoji test now that it works in Windows Travis
 builds

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

diff --git a/features/core.feature b/features/core.feature
index c023cd4c..34539efb 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -41,6 +41,14 @@ Feature: Basic reading and writing to a journal
         When we run "jrnl -on 'june 6 2013' --short"
         Then the output should be "2013-06-10 15:40 Life is good."
 
+    Scenario: Emoji support
+        Given we use the config "basic.yaml"
+        When we run "jrnl 23 july 2013: 🌞 sunny day. Saw an 🐘"
+        Then we should see the message "Entry added"
+        When we run "jrnl -n 1"
+        Then the output should contain "🌞"
+        and the output should contain "🐘"
+
     Scenario: Writing an entry at the prompt
         Given we use the config "basic.yaml"
         When we run "jrnl" and enter "25 jul 2013: I saw Elvis. He's alive."