Refactor, use Promise.all, which is now well supported

cburgmer · cburgmer · commit cd40584513bb · 2022-01-22T19:40:44.000+01:00
diff --git a/src/main.js b/src/main.js
@@ -41,7 +41,7 @@ csscriticLib.main = function (
     };
 
     var fetchStartingComparisons = function (testCases) {
-        return util.all(
+        return Promise.all(
             testCases.map(function (testCase) {
                 return storage.readReferenceImage(testCase).then(
                     function (referenceImageRecord) {
@@ -74,7 +74,7 @@ csscriticLib.main = function (
     };
 
     var reportConfiguredComparisons = function (comparisonSelection) {
-        return util.all(
+        return Promise.all(
             comparisonSelection.map(function (selection) {
                 var isSelected = selection.selected;
                 return reporting.doReportConfiguredComparison(
@@ -115,7 +115,7 @@ csscriticLib.main = function (
                         return selection.configuredComparison;
                     });
 
-                return util.all(selectedComparisons.map(executeTestCase));
+                return Promise.all(selectedComparisons.map(executeTestCase));
             })
             .then(function (comparisons) {
                 allPassed = util.hasTestSuitePassed(comparisons);
diff --git a/src/reporting.js b/src/reporting.js
@@ -64,7 +64,7 @@ csscriticLib.reporting = function (renderer, storage, util) {
         configuredComparison,
         isSelected
     ) {
-        return util.all(
+        return Promise.all(
             reporters.map(function (reporter) {
                 var reportingFunc = reportingMethod(reporter, isSelected);
                 if (reportingFunc) {
@@ -79,7 +79,7 @@ csscriticLib.reporting = function (renderer, storage, util) {
 
         attachPageAcceptHelpers(result);
 
-        return util.all(
+        return Promise.all(
             reporters.map(function (reporter) {
                 if (reporter.reportComparison) {
                     return reporter.reportComparison(result);
@@ -89,7 +89,7 @@ csscriticLib.reporting = function (renderer, storage, util) {
     };
 
     module.doReportTestSuite = function (passed) {
-        return util.all(
+        return Promise.all(
             reporters.map(function (reporter) {
                 if (reporter.reportTestSuite) {
                     return reporter.reportTestSuite({ success: passed });
diff --git a/src/util.js b/src/util.js
@@ -159,41 +159,5 @@ csscriticLib.util = function () {
         return hasValidTestSetup && allPassed;
     };
 
-    module.all = function (functionReturnValues) {
-        var defer = ayepromise.defer(),
-            pendingFunctionCalls = functionReturnValues.length,
-            resolvedValues = [];
-
-        var functionCallResolved = function (value, idx) {
-            pendingFunctionCalls -= 1;
-            resolvedValues[idx] = value;
-
-            if (pendingFunctionCalls === 0) {
-                defer.resolve(resolvedValues);
-            }
-        };
-
-        if (functionReturnValues.length === 0) {
-            defer.resolve([]);
-            return defer.promise;
-        }
-
-        functionReturnValues.forEach(function (returnValue, idx) {
-            if (returnValue && returnValue.then) {
-                returnValue.then(
-                    function (result) {
-                        functionCallResolved(result, idx);
-                    },
-                    function (e) {
-                        defer.reject(e);
-                    }
-                );
-            } else {
-                functionCallResolved(returnValue, idx);
-            }
-        });
-        return defer.promise;
-    };
-
     return module;
 };
diff --git a/test/specs/utilSpec.js b/test/specs/utilSpec.js
@@ -300,104 +300,4 @@ describe("Utility", function () {
             expect(passed).toBe(false);
         });
     });
-
-    describe("all", function () {
-        it("should fulfill once a passed promise is fulfilled", function (done) {
-            var defer = ayepromise.defer(),
-                resolved = false;
-
-            util.all([defer.promise]).then(function () {
-                expect(resolved).toBe(true);
-                done();
-            });
-
-            defer.resolve();
-
-            resolved = true;
-        });
-
-        it("should fulfill without a promise returned", function (done) {
-            util.all([undefined]).then(done);
-        });
-
-        it("should fulfill once multiple passed promises are fulfilled", function (done) {
-            var deferOne = ayepromise.defer(),
-                deferTwo = ayepromise.defer(),
-                resolvedCount = 0;
-
-            var incResolveCount = function () {
-                resolvedCount += 1;
-            };
-
-            deferOne.promise.then(incResolveCount);
-            deferTwo.promise.then(function () {
-                setTimeout(incResolveCount, 1);
-            });
-
-            util.all([deferOne.promise, deferTwo.promise]).then(function () {
-                expect(resolvedCount).toBe(2);
-                done();
-            });
-
-            deferOne.resolve();
-            deferTwo.resolve();
-        });
-
-        it("should return the promises value", function (done) {
-            var defer = ayepromise.defer();
-
-            util.all([defer.promise]).then(function (values) {
-                expect(values).toEqual([42]);
-                done();
-            });
-
-            defer.resolve(42);
-        });
-
-        it("should return a non-promise value", function (done) {
-            util.all([21]).then(function (values) {
-                expect(values).toEqual([21]);
-                done();
-            });
-        });
-
-        it("should return the promises' values", function (done) {
-            var deferOne = ayepromise.defer(),
-                deferTwo = ayepromise.defer();
-
-            util.all([deferOne.promise, deferTwo.promise]).then(function (
-                values
-            ) {
-                expect(values).toEqual(["12", "34"]);
-                done();
-            });
-
-            setTimeout(function () {
-                deferOne.resolve("12");
-            }, 1);
-            deferTwo.resolve("34");
-        });
-
-        it("should resolve for an empty input list", function (done) {
-            util.all([]).then(function (values) {
-                expect(values).toEqual([]);
-
-                done();
-            });
-        });
-
-        it("should fail if one of the promises fails", function (done) {
-            var deferOne = ayepromise.defer(),
-                deferTwo = ayepromise.defer(),
-                error = new Error("fail");
-
-            util.all([deferOne.promise, deferTwo.promise]).fail(function (e) {
-                expect(e).toBe(error);
-                done();
-            });
-
-            deferOne.resolve("1");
-            deferTwo.reject(error);
-        });
-    });
 });
