Enable unit test for non-UTF-8 on CLI

Author: cburgmer

Gruntfile.js

@@ -7,6 +7,16 @@ module.exports = function (grunt) {
                 options: {
                     port: 8765,
                     hostname: "127.0.0.1",
+                    middleware: function (connect, options, middlewares) {
+                        middlewares.unshift(function (req, res, next) {
+                            if (/\s*\.html/.test(req.url)) {
+                                // work around https://github.com/gruntjs/grunt-contrib-connect/issues/95
+                                res.setHeader("Content-Type", "text/html;");
+                            }
+                            return next();
+                        });
+                        return middlewares;
+                    },
                 },
             },
         },

test/.jshintrc

@@ -15,7 +15,6 @@
         "spyOn": true,
 
         "ifNotInWebkitOrBlinkIt": true,
-        "ifNotInHeadlessChrome": true,
         "testHelper": true,
         "diffHelper": true,
 

test/helpers.js

@@ -2,7 +2,6 @@
     "use strict";
 
     var isWebkitOrBlink = navigator.userAgent.indexOf("WebKit") >= 0,
-        isHeadlessChrome = navigator.userAgent.indexOf("HeadlessChrome") >= 0,
         testDisabledOnCondition = function (condition, text, functionHandle) {
             var spec = it(text, functionHandle);
             if (condition) {
@@ -13,7 +12,4 @@
     window.ifNotInWebkitOrBlinkIt = function (text, functionHandle) {
         return testDisabledOnCondition(isWebkitOrBlink, text, functionHandle);
     };
-    window.ifNotInHeadlessChrome = function (text, functionHandle) {
-        return testDisabledOnCondition(isHeadlessChrome, text, functionHandle);
-    };
 })();

test/specs/integration.test.js

@@ -152,33 +152,30 @@ describe("Integration test", function () {
             .finally(done);
     });
 
-    ifNotInHeadlessChrome(
-        "should take a URL and load non UTF-8 content",
-        function (done) {
-            var inlineReferencesSpy = spyOn(
-                inlineresources,
-                "inlineReferences"
-            ).and.returnValue(Promise.resolve());
+    it("should take a URL and load non UTF-8 content", function (done) {
+        var inlineReferencesSpy = spyOn(
+            inlineresources,
+            "inlineReferences"
+        ).and.returnValue(Promise.resolve());
 
-            rasterizeHTML
-                .drawURL(testHelper.fixturesPath + "nonUTF8Encoding.html")
-                .then(function () {
-                    expect(inlineReferencesSpy).toHaveBeenCalled();
+        rasterizeHTML
+            .drawURL(testHelper.fixturesPath + "nonUTF8Encoding.html")
+            .then(function () {
+                expect(inlineReferencesSpy).toHaveBeenCalled();
 
-                    var doc = inlineReferencesSpy.calls.mostRecent().args[0];
+                var doc = inlineReferencesSpy.calls.mostRecent().args[0];
 
-                    // This fails if SpecRunner is opened locally in Firefox. Open over a local webserver helps here.
-                    expect(doc.querySelector("body").innerHTML.trim()).toEqual(
-                        "这是中文"
-                    );
-                })
-                .catch(function (err) {
-                    expect(err).toBe(null);
-                    fail();
-                })
-                .finally(done);
-        }
-    );
+                // This fails if SpecRunner is opened locally in Firefox. Open over a local webserver helps here.
+                expect(doc.querySelector("body").innerHTML.trim()).toEqual(
+                    "这是中文"
+                );
+            })
+            .catch(function (err) {
+                expect(err).toBe(null);
+                fail();
+            })
+            .finally(done);
+    });
 
     it("should work around Firefox bug with `null` style properties", function (done) {
         // The bug only turns up when there's no JS executed which creates a new document