WebKit seems to have done better in newest version. Enable all the tests there

cburgmer · cburgmer · commit 3e6cdb7e1b99 · 2018-12-01T16:16:47.000+01:00
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -16,12 +16,10 @@
 
         "require": true,
 
-        "ifNotInWebkitIt": true,
         "ifNotInWebkitOrBlinkIt": true,
-        "ifInPhantomJsIt": true,
         "ifNotInPhantomJsIt": true,
         "ifNotInPhantomJSAndNotLocalRunnerIt": true,
-        "ifNotInWebKitAndNotLocalRunnerIt": true,
+        "ifNotLocalRunnerIt": true,
         "testHelper": true,
         "diffHelper": true,
 
diff --git a/test/helpers.js b/test/helpers.js
@@ -1,9 +1,7 @@
 (function () {
     "use strict";
 
-    var isWebkit = navigator.userAgent.indexOf("WebKit") >= 0 &&
-            navigator.userAgent.indexOf("Chrome") < 0,
-        isWebkitOrBlink = navigator.userAgent.indexOf("WebKit") >= 0,
+    var isWebkitOrBlink = navigator.userAgent.indexOf("WebKit") >= 0,
         isPhantomJs = navigator.userAgent.indexOf("PhantomJS") >= 0,
         isLocalRunner = document.baseURI.substr(0, 'file://'.length) === 'file://',
         testDisabledOnCondition = function (condition, text, functionHandle) {
@@ -13,9 +11,6 @@
             }
             return spec;
         };
-    window.ifNotInWebkitIt = function(text, functionHandle) {
-        return testDisabledOnCondition(isWebkit, text, functionHandle);
-    };
     window.ifNotInWebkitOrBlinkIt = function (text, functionHandle) {
         return testDisabledOnCondition(isWebkitOrBlink, text, functionHandle);
     };
@@ -28,7 +23,7 @@
     window.ifNotInPhantomJSAndNotLocalRunnerIt = function (text, functionHandle) {
         return testDisabledOnCondition(isPhantomJs || isLocalRunner, text, functionHandle);
     };
-    window.ifNotInWebKitAndNotLocalRunnerIt = function (text, functionHandle) {
-        return testDisabledOnCondition(isWebkit || isLocalRunner, text, functionHandle);
+    window.ifNotLocalRunnerIt = function (text, functionHandle) {
+        return testDisabledOnCondition(isLocalRunner, text, functionHandle);
     };
 }());
diff --git a/test/specs/IntegrationSpec.js b/test/specs/IntegrationSpec.js
@@ -28,7 +28,7 @@ describe("Integration test", function () {
         callback = jasmine.createSpy("callback").and.callFake(function () { finished = true; });
     });
 
-    ifNotInWebkitIt("should take a document, inline all displayable content and render to the given canvas", function (done) {
+    ifNotInPhantomJsIt("should take a document, inline all displayable content and render to the given canvas", function (done) {
         testHelper.readHTMLDocumentFixture("test.html").then(function (doc) {
             rasterizeHTML.drawDocument(doc, canvas, {
                     cache: 'none',
@@ -51,7 +51,7 @@ describe("Integration test", function () {
         });
     });
 
-    ifNotInWebkitIt("should take a HTML string, inline all displayable content and render to the given canvas", function (done) {
+    ifNotInPhantomJsIt("should take a HTML string, inline all displayable content and render to the given canvas", function (done) {
         testHelper.readHTMLFixture("test.html").then(function (html) {
             rasterizeHTML.drawHTML(html, canvas, {
                 baseUrl: testHelper.fixturesPath,
@@ -73,7 +73,7 @@ describe("Integration test", function () {
         });
     });
 
-    ifNotInWebkitIt("should take a URL, inline all displayable content and render to the given canvas", function (done) {
+    ifNotInPhantomJsIt("should take a URL, inline all displayable content and render to the given canvas", function (done) {
         rasterizeHTML.drawURL(testHelper.fixturesPath + "testScaled50PercentWithJs.html", canvas, {
             cache: 'none',
             executeJs: true,
@@ -95,7 +95,7 @@ describe("Integration test", function () {
         }).finally(done);
     });
 
-    ifNotInWebkitIt("should render a URL without canvas", function (done) {
+    ifNotInPhantomJsIt("should render a URL without canvas", function (done) {
         rasterizeHTML.drawURL(testHelper.fixturesPath + "testScaled50PercentWithJs.html", {
             cache: 'none',
             width: width,
@@ -135,7 +135,7 @@ describe("Integration test", function () {
         }).finally(done);
     });
 
-    ifNotInWebKitAndNotLocalRunnerIt("should work around Firefox bug with `null` style properties", function (done) {
+    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", {
diff --git a/test/specs/Svg2ImageSpec.js b/test/specs/Svg2ImageSpec.js
@@ -12,7 +12,7 @@ describe("Svg to Image", function () {
             jasmine.addMatchers(imagediff.jasmine);
         });
 
-        ifNotInWebkitIt("should render the SVG", function (done) {
+        ifNotInPhantomJsIt("should render the SVG", function (done) {
             var referenceImg = createElementFrom('<img src="' + testHelper.fixturesPath + 'rednblue.png" alt="test image"/>'),
                 twoColorSvg = (
                     '<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">' +
@@ -45,7 +45,7 @@ describe("Svg to Image", function () {
             };
         });
 
-        ifNotInWebkitIt("should render an SVG with inline image", function (done) {
+        ifNotInPhantomJsIt("should render an SVG with inline image", function (done) {
             var referenceImg = createElementFrom('<img src="' + testHelper.fixturesPath + 'rednblue.png" alt="test image"/>'),
                 twoColorSvg = (
                     '<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">' +
