Refactor, reduce reliance on external promise dependency in tests

cburgmer · cburgmer · commit 94a76180da2a · 2022-01-22T19:36:50.000+01:00
diff --git a/test/specs/integrationSpec.js b/test/specs/integrationSpec.js
@@ -50,52 +50,50 @@ describe("Integration", function () {
     };
 
     var getDb = function () {
-        var defer = ayepromise.defer();
-
-        var request = indexedDB.open("csscritic", 1);
-        request.onsuccess = function (event) {
-            var db = event.target.result;
-            defer.resolve(db);
-        };
-        request.onupgradeneeded = function (event) {
-            var db = event.target.result;
-            db.createObjectStore("references", { keyPath: "testCase" });
-        };
-        return defer.promise;
+        return new Promise(function (fulfill) {
+            var request = indexedDB.open("csscritic", 1);
+            request.onsuccess = function (event) {
+                var db = event.target.result;
+                fulfill(db);
+            };
+            request.onupgradeneeded = function (event) {
+                var db = event.target.result;
+                db.createObjectStore("references", { keyPath: "testCase" });
+            };
+        });
     };
 
     var storeReferenceImage = function (key, data) {
-        var defer = ayepromise.defer();
-        getDb().then(function (db) {
-            var request = db
-                .transaction(["references"], "readwrite")
-                .objectStore("references")
-                .add({ testCase: key, reference: data });
-
-            request.onsuccess = function () {
-                db.close();
-                defer.resolve();
-            };
+        return getDb().then(function (db) {
+            return new Promise(function (fulfill) {
+                var request = db
+                    .transaction(["references"], "readwrite")
+                    .objectStore("references")
+                    .add({ testCase: key, reference: data });
+
+                request.onsuccess = function () {
+                    db.close();
+                    fulfill();
+                };
+            });
         });
-        return defer.promise;
     };
 
     var readReferenceImage = function (key) {
-        var defer = ayepromise.defer();
-
-        getDb().then(function (db) {
-            var request = db
-                .transaction(["references"])
-                .objectStore("references")
-                .get(key);
-
-            request.onsuccess = function () {
-                db.close();
-                // TODO stop using JSON string as interface in test
-                defer.resolve(request.result.reference);
-            };
+        return getDb().then(function (db) {
+            return new Promise(function (fulfill) {
+                var request = db
+                    .transaction(["references"])
+                    .objectStore("references")
+                    .get(key);
+
+                request.onsuccess = function () {
+                    db.close();
+                    // TODO stop using JSON string as interface in test
+                    fulfill(request.result.reference);
+                };
+            });
         });
-        return defer.promise;
     };
 
     beforeEach(function () {
diff --git a/test/specs/mainSpec.js b/test/specs/mainSpec.js
@@ -221,74 +221,88 @@ describe("Main", function () {
     });
 
     describe("Reporting", function () {
-        var triggerDelayedPromise = function () {
-            jasmine.clock().tick(100);
-        };
-
-        beforeEach(function () {
-            jasmine.clock().install();
-        });
-
-        afterEach(function () {
-            jasmine.clock().uninstall();
-        });
-
-        it("should report a starting comparison with reference image", function () {
+        it("should report a starting comparison with reference image", function (done) {
             setUpReferenceImage("the image", "the viewport");
 
             csscritic.add("samplepage.html");
-            csscritic.execute();
+            csscritic
+                .execute()
+                .then(null, function () {}) // catch error
+                .then(function () {
+                    expect(
+                        reporting.doReportConfiguredComparison
+                    ).toHaveBeenCalledWith(
+                        {
+                            testCase: {
+                                url: "samplepage.html",
+                            },
+                            referenceImage: "the image",
+                            viewport: "the viewport",
+                        },
+                        true
+                    );
 
-            triggerDelayedPromise();
-            expect(reporting.doReportConfiguredComparison).toHaveBeenCalledWith(
-                {
-                    testCase: {
-                        url: "samplepage.html",
-                    },
-                    referenceImage: "the image",
-                    viewport: "the viewport",
-                },
-                true
-            );
+                    done();
+                });
         });
 
-        it("should report a starting comparison without reference image", function () {
+        it("should report a starting comparison without reference image", function (done) {
             setUpReferenceImageMissing();
 
             csscritic.add("samplepage.html");
-            csscritic.execute();
+            csscritic
+                .execute()
+                .then(null, function () {}) // catch error
+                .then(function () {
+                    expect(
+                        reporting.doReportConfiguredComparison
+                    ).toHaveBeenCalledWith(
+                        {
+                            testCase: {
+                                url: "samplepage.html",
+                            },
+                        },
+                        true
+                    );
 
-            triggerDelayedPromise();
-            expect(reporting.doReportConfiguredComparison).toHaveBeenCalledWith(
-                {
-                    testCase: {
-                        url: "samplepage.html",
-                    },
-                },
-                true
-            );
+                    done();
+                });
         });
 
-        it("should wait for reporting on starting comparison to finish", function () {
-            var defer = ayepromise.defer(),
+        var sleep = function () {
+            return new Promise(function (fulfill) {
+                setTimeout(fulfill, 100);
+            });
+        };
+
+        it("should wait for reporting on starting comparison to finish", function (done) {
+            var reportingFulfill,
                 callback = jasmine.createSpy("callback");
 
             setUpReferenceImageMissing();
             setUpComparison({ testCase: { url: "something" } });
             csscritic.add("something");
 
             reporting.doReportConfiguredComparison.and.returnValue(
-                defer.promise
+                new Promise(function (fulfill) {
+                    reportingFulfill = fulfill;
+                })
             );
             csscritic.execute().then(callback);
 
-            triggerDelayedPromise();
-            expect(callback).not.toHaveBeenCalled();
+            sleep()
+                .then(function () {
+                    expect(callback).not.toHaveBeenCalled();
+
+                    reportingFulfill();
 
-            defer.resolve();
+                    return sleep();
+                })
+                .then(function () {
+                    expect(callback).toHaveBeenCalled();
 
-            triggerDelayedPromise();
-            expect(callback).toHaveBeenCalled();
+                    done();
+                });
         });
 
         it("should call final report on empty test case list and report as failed", function (done) {
@@ -297,46 +311,63 @@ describe("Main", function () {
 
                 done();
             });
-
-            triggerDelayedPromise();
         });
 
-        it("should wait for reporting on comparison to finish", function () {
-            var defer = ayepromise.defer(),
+        it("should wait for reporting on comparison to finish", function (done) {
+            var reportingFulfill,
                 callback = jasmine.createSpy("callback");
 
             setUpReferenceImage("the image", "the viewport");
             setUpComparison({
                 status: "success",
             });
 
-            reporting.doReportComparison.and.returnValue(defer.promise);
+            reporting.doReportComparison.and.returnValue(
+                new Promise(function (fulfill) {
+                    reportingFulfill = fulfill;
+                })
+            );
             csscritic.add("a_test");
             csscritic.execute().then(callback);
 
-            triggerDelayedPromise();
-            expect(callback).not.toHaveBeenCalled();
+            sleep()
+                .then(function () {
+                    expect(callback).not.toHaveBeenCalled();
 
-            defer.resolve();
+                    reportingFulfill();
+                    return sleep();
+                })
+                .then(function () {
+                    expect(callback).toHaveBeenCalled();
 
-            triggerDelayedPromise();
-            expect(callback).toHaveBeenCalled();
+                    done();
+                });
         });
 
-        it("should wait for reporting on final report to finish", function () {
-            var defer = ayepromise.defer(),
+        it("should wait for reporting on final report to finish", function (done) {
+            var reportingFulfill,
                 callback = jasmine.createSpy("callback");
 
-            reporting.doReportTestSuite.and.returnValue(defer.promise);
+            reporting.doReportTestSuite.and.returnValue(
+                new Promise(function (fulfill) {
+                    reportingFulfill = fulfill;
+                })
+            );
             csscritic.execute().then(callback);
 
-            triggerDelayedPromise();
-            expect(callback).not.toHaveBeenCalled();
+            sleep()
+                .then(function () {
+                    expect(callback).not.toHaveBeenCalled();
+
+                    reportingFulfill();
 
-            defer.resolve();
+                    return sleep();
+                })
+                .then(function () {
+                    expect(callback).toHaveBeenCalled();
 
-            triggerDelayedPromise();
-            expect(callback).toHaveBeenCalled();
+                    done();
+                });
         });
     });
 
