From 22f792363485f7123e0abb12e64feec2a08c16c0 Mon Sep 17 00:00:00 2001
From: Brian Whitney <brian.m.whitney@outlook.com>
Date: Tue, 19 Feb 2019 07:17:25 -0500
Subject: [PATCH] Think I actually commited the test fixes this time

---
 tests/operations/index.mjs      | 56 +--------------------------------
 tests/operations/tests/Mime.mjs |  8 ++---
 2 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/tests/operations/index.mjs b/tests/operations/index.mjs
index 07e3ed75..ffdd2c05 100644
--- a/tests/operations/index.mjs
+++ b/tests/operations/index.mjs
@@ -24,7 +24,6 @@ global.ENVIRONMENT_IS_WEB = function() {
 };
 
 import TestRegister from "./TestRegister";
-<<<<<<< HEAD:tests/operations/index.mjs
 import "./tests/BCD";
 import "./tests/BSON";
 import "./tests/Base58";
@@ -58,6 +57,7 @@ import "./tests/JWTSign";
 import "./tests/JWTVerify";
 import "./tests/MS";
 import "./tests/Magic";
+import "./tests/Mime";
 import "./tests/MorseCode";
 import "./tests/NetBIOS";
 import "./tests/OTP";
@@ -87,60 +87,6 @@ import "./tests/ConvertCoordinateFormat";
 
 // Cannot test operations that use the File type yet
 //import "./tests/SplitColourChannels";
-=======
-import "./tests/operations/BCD";
-import "./tests/operations/BSON";
-import "./tests/operations/Base58";
-import "./tests/operations/Base64";
-import "./tests/operations/BitwiseOp";
-import "./tests/operations/ByteRepr";
-import "./tests/operations/CartesianProduct";
-import "./tests/operations/CharEnc";
-import "./tests/operations/Checksum";
-import "./tests/operations/Ciphers";
-import "./tests/operations/Code";
-import "./tests/operations/Comment";
-import "./tests/operations/Compress";
-import "./tests/operations/ConditionalJump";
-import "./tests/operations/Crypt";
-import "./tests/operations/DateTime";
-import "./tests/operations/ExtractEmailAddresses";
-import "./tests/operations/Fork";
-import "./tests/operations/FromDecimal";
-import "./tests/operations/FromGeohash";
-import "./tests/operations/Hash";
-import "./tests/operations/HaversineDistance";
-import "./tests/operations/Hexdump";
-import "./tests/operations/Image";
-import "./tests/operations/Jump";
-import "./tests/operations/JWTDecode";
-import "./tests/operations/JWTSign";
-import "./tests/operations/JWTVerify";
-import "./tests/operations/MS";
-import "./tests/operations/Magic";
-import "./tests/operations/MorseCode";
-import "./tests/operations/NetBIOS";
-import "./tests/operations/OTP";
-import "./tests/operations/PGP";
-import "./tests/operations/PHP";
-import "./tests/operations/ParseIPRange";
-import "./tests/operations/PowerSet";
-import "./tests/operations/Regex";
-import "./tests/operations/Register";
-import "./tests/operations/RemoveDiacritics";
-import "./tests/operations/Rotate";
-import "./tests/operations/SeqUtils";
-import "./tests/operations/SetDifference";
-import "./tests/operations/SetIntersection";
-import "./tests/operations/SetUnion";
-import "./tests/operations/StrUtils";
-import "./tests/operations/SymmetricDifference";
-import "./tests/operations/ToGeohash.mjs";
-import "./tests/operations/TranslateDateTimeFormat";
-import "./tests/operations/Magic";
-import "./tests/operations/ParseTLV";
-import "./tests/operations/Mime";
->>>>>>> 34288bc25fc733dbd8a20fda32c19c58921aa02f:test/index.mjs
 
 let allTestsPassing = true;
 const testStatusCounts = {
diff --git a/tests/operations/tests/Mime.mjs b/tests/operations/tests/Mime.mjs
index bb304ef1..05c2f5da 100644
--- a/tests/operations/tests/Mime.mjs
+++ b/tests/operations/tests/Mime.mjs
@@ -10,12 +10,12 @@ import TestRegister from "../TestRegister";
 TestRegister.addTests([
     {
         name: "Decode Mime Encoded Words",
-        input: "This is a GBK base64 encoded word: =?GBK?B?572R57uc5Y6o5biI?=\nThis is a Cyrillic quoted word: =?utf-8?Q?=D0=A2=D0=B5=D1=81=D1=82_=D0=A2=D0=B5=D1=81=D1=82_=D0=A2=D0=B5=D1=81=D1=82?=.",
-        expectedOutput: "This is a GBK base64 encoded word: 网络厨师.\nThis is a Cyrillic quoted word: Кибер Шеф.",
+        input: "This is a GBK base64 encoded word: =?GBK?B?zfjC57P4yqY=?=.\nThis is a Cyrillic UTF-8 quoted word: =?utf-8?Q?=d0=9a=d0=b8=d0=b1=d0=b5=d1=80_=d0=a8=d0=b5=d1=84?=.",
+        expectedOutput: "This is a GBK base64 encoded word: 网络厨师.\nThis is a Cyrillic UTF-8 quoted word: Кибер Шеф.",
         recipeConfig: [
             {
-                "op": "Decode Mime Encoded Words",
-                "args": []
+                op: "Decode Mime Encoded Words",
+                args: []
             }
         ]
     },