Refactor, reduce reliance on external promise dependency in tests

cburgmer · cburgmer · commit 31f8b08a5bb7 · 2022-01-22T19:45:32.000+01:00
diff --git a/test/specs/mainSpec.js b/test/specs/mainSpec.js
@@ -6,22 +6,20 @@ describe("Main", function () {
     var util = csscriticLib.util();
 
     var setUpComparison = function (comparison) {
-        regression.compare.and.returnValue(
-            testHelper.successfulPromise(comparison)
-        );
+        regression.compare.and.returnValue(Promise.resolve(comparison));
     };
 
     var setUpReferenceImage = function (image, viewport) {
         storage.readReferenceImage.and.returnValue(
-            testHelper.successfulPromise({
+            Promise.resolve({
                 image: image,
                 viewport: viewport,
             })
         );
     };
 
     var setUpReferenceImageMissing = function () {
-        storage.readReferenceImage.and.returnValue(testHelper.failedPromise());
+        storage.readReferenceImage.and.returnValue(Promise.reject());
     };
 
     beforeEach(function () {
@@ -31,14 +29,10 @@ describe("Main", function () {
             "doReportTestSuite",
         ]);
         reporting.doReportConfiguredComparison.and.returnValue(
-            testHelper.successfulPromise()
-        );
-        reporting.doReportComparison.and.returnValue(
-            testHelper.successfulPromise()
-        );
-        reporting.doReportTestSuite.and.returnValue(
-            testHelper.successfulPromise()
+            Promise.resolve()
         );
+        reporting.doReportComparison.and.returnValue(Promise.resolve());
+        reporting.doReportTestSuite.and.returnValue(Promise.resolve());
 
         regression = jasmine.createSpyObj("regression", ["compare"]);
         storage = jasmine.createSpyObj("storage", ["readReferenceImage"]);
diff --git a/test/specs/regressionSpec.js b/test/specs/regressionSpec.js
@@ -327,9 +327,7 @@ describe("Regression testing", function () {
                 message: "some message",
                 originalError: new Error("original error"),
             };
-            rendererBackend.render.and.returnValue(
-                testHelper.failedPromise(error)
-            );
+            rendererBackend.render.and.returnValue(Promise.reject(error));
         });
 
         it("should report the comparison", function (done) {
diff --git a/test/testHelper.js b/test/testHelper.js
@@ -88,12 +88,6 @@ window.testHelper = (function () {
         return tempSubPath;
     };
 
-    module.successfulPromise = function (value) {
-        var defer = ayepromise.defer();
-        defer.resolve(value);
-        return defer.promise;
-    };
-
     module.failedPromise = function (e) {
         var defer = ayepromise.defer();
         defer.reject(e);
@@ -137,18 +131,17 @@ window.testHelper = (function () {
     };
 
     module.waitsFor = function (predicate) {
-        var timeout = 2000,
-            defer = ayepromise.defer();
-
-        doWait(predicate, timeout, function (predicateResovled) {
-            if (predicateResovled) {
-                defer.resolve();
-            } else {
-                defer.reject();
-            }
+        var timeout = 2000;
+
+        return new Promise(function (fulfill, reject) {
+            doWait(predicate, timeout, function (predicateResovled) {
+                if (predicateResovled) {
+                    fulfill();
+                } else {
+                    reject();
+                }
+            });
         });
-
-        return defer.promise;
     };
 
     return module;
