Skip to content

Commit aa438a7

Browse files
committed
Refactor, reduce reliance on external promise dependency in tests
1 parent ed71da8 commit aa438a7

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

test/specs/indexedDbStorageSpec.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ describe("IndexedDB storage", function () {
9696
};
9797

9898
var setUpImageForUrlToFail = function (e) {
99-
util.getImageForUrl.and.returnValue(testHelper.failedPromise(e));
99+
util.getImageForUrl.and.rejectWith(e);
100100
};
101101

102102
beforeEach(function (done) {
@@ -270,7 +270,7 @@ describe("IndexedDB storage", function () {
270270
});
271271

272272
it("should call error handler if read reference image is invalid", function (done) {
273-
setUpImageForUrlToFail();
273+
setUpImageForUrlToFail(new Error("blargh"));
274274

275275
storeMockReferenceImage(
276276
"somePage.html",
@@ -280,7 +280,9 @@ describe("IndexedDB storage", function () {
280280
);
281281
storage
282282
.readReferenceImage({ url: "somePage.html" })
283-
.then(null, done);
283+
.then(null, function () {
284+
done();
285+
});
284286
});
285287

286288
it("should honour test case parameters when reading", function (done) {

test/testHelper.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ window.testHelper = (function () {
2525
});
2626
};
2727

28-
module.failedPromise = function (e) {
29-
var defer = ayepromise.defer();
30-
defer.reject(e);
31-
return defer.promise;
32-
};
33-
3428
module.deferFake = function (value) {
3529
var successHandler,
3630
resolved = false;

0 commit comments

Comments
 (0)