Do not support SpecRunner.html via file://

cburgmer · cburgmer · commit 4fbca4c6626a · 2022-01-16T19:56:50.000+01:00
We stopped doing this in 65b1239
diff --git a/src/.jshintrc b/src/.jshintrc
@@ -18,7 +18,6 @@
         "proxies": true,
         "documentUtil": true,
         "documentHelper": true,
-        "mediaQueryHelper": true,
         "browser": true,
         "svg2image": true,
         "document2svg": true,
@@ -38,7 +37,6 @@
         "proxies",
         "browser",
         "documentUtil",
-        "documentHelper",
-        "mediaQueryHelper"
+        "documentHelper"
     ]
 }
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -15,17 +15,14 @@
         "spyOn": true,
 
         "ifNotInWebkitOrBlinkIt": true,
-        "ifNotInHeadlessChromeAndNotLocalRunnerIt": true,
-        "ifNotInWebKitAndNotLocalRunnerIt": true,
-        "ifNotLocalRunnerIt": true,
+        "ifNotInHeadlessChrome": true,
         "testHelper": true,
         "diffHelper": true,
 
         "util": true,
         "proxies": true,
         "documentUtil": true,
         "documentHelper": true,
-        "mediaQueryHelper": true,
         "browser": true,
         "svg2image": true,
         "document2svg": true,
diff --git a/test/helpers.js b/test/helpers.js
@@ -3,8 +3,6 @@
 
     var isWebkitOrBlink = navigator.userAgent.indexOf("WebKit") >= 0,
         isHeadlessChrome = navigator.userAgent.indexOf("HeadlessChrome") >= 0,
-        isLocalRunner =
-            document.baseURI.substr(0, "file://".length) === "file://",
         testDisabledOnCondition = function (condition, text, functionHandle) {
             var spec = it(text, functionHandle);
             if (condition) {
@@ -15,17 +13,7 @@
     window.ifNotInWebkitOrBlinkIt = function (text, functionHandle) {
         return testDisabledOnCondition(isWebkitOrBlink, text, functionHandle);
     };
-    window.ifNotInHeadlessChromeAndNotLocalRunnerIt = function (
-        text,
-        functionHandle
-    ) {
-        return testDisabledOnCondition(
-            isHeadlessChrome || isLocalRunner,
-            text,
-            functionHandle
-        );
-    };
-    window.ifNotLocalRunnerIt = function (text, functionHandle) {
-        return testDisabledOnCondition(isLocalRunner, text, functionHandle);
+    window.ifNotInHeadlessChrome = function (text, functionHandle) {
+        return testDisabledOnCondition(isHeadlessChrome, text, functionHandle);
     };
 })();
diff --git a/test/specs/integration.test.js b/test/specs/integration.test.js
@@ -152,8 +152,7 @@ describe("Integration test", function () {
             .finally(done);
     });
 
-    // This fails in Firefox probably due to https://bugzilla.mozilla.org/show_bug.cgi?id=942138
-    ifNotInHeadlessChromeAndNotLocalRunnerIt(
+    ifNotInHeadlessChrome(
         "should take a URL and load non UTF-8 content",
         function (done) {
             var inlineReferencesSpy = spyOn(
@@ -181,31 +180,28 @@ describe("Integration test", function () {
         }
     );
 
-    ifNotLocalRunnerIt(
-        "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
-            // In addition this test will fail due to https://bugzilla.mozilla.org/show_bug.cgi?id=942138
-            rasterizeHTML
-                .drawURL(testHelper.fixturesPath + "test.html", {
-                    cache: "none",
-                    active: ".bgimage",
-                    hover: ".webfont",
-                    clip: "body",
-                    width: 200,
-                    height: 100,
-                })
-                .then(function (result) {
-                    forceImageSizeForPlatformCompatibility(result.image);
-                    expect(result.image).toEqualImage(referenceImg, 2);
-                })
-                .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
+        // In addition this test will fail due to https://bugzilla.mozilla.org/show_bug.cgi?id=942138
+        rasterizeHTML
+            .drawURL(testHelper.fixturesPath + "test.html", {
+                cache: "none",
+                active: ".bgimage",
+                hover: ".webfont",
+                clip: "body",
+                width: 200,
+                height: 100,
+            })
+            .then(function (result) {
+                forceImageSizeForPlatformCompatibility(result.image);
+                expect(result.image).toEqualImage(referenceImg, 2);
+            })
+            .catch(function (err) {
+                expect(err).toBe(null);
+                fail();
+            })
+            .finally(done);
+    });
 
     it("should report a source error on invalid input from HTML", function (done) {
         rasterizeHTML
