Skip to content

Commit 75ca7d8

Browse files
committed
Optimize Unit Test helpers.
1 parent 5c60e4c commit 75ca7d8

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

tests/spec/Helpers.js

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
beforeEach(function (done) {
2-
this.assetsBasePath = "_assets/art/";
1+
var customMatchers = {
2+
toBeInRange: function(util, customEqualityTesters) {
3+
return {
4+
compare: function(actual, excpected, range) {
5+
var result = {};
6+
range = range || 0;
7+
8+
if (actual <= (excpected + range) && actual >= (excpected - range)) {
9+
result.pass = true;
10+
} else {
11+
result.pass = false;
12+
}
13+
return result;
14+
}
15+
};
16+
}
17+
};
318

19+
beforeAll(function(done) {
20+
this.assetsBasePath = "_assets/art/";
421
this.sColor = "#000";
522
this.fColor = "#ff0000";
6-
7-
this.stage = new createjs.Stage(imagediff.createCanvas(200, 200));
8-
9-
jasmine.addMatchers(imagediff.jasmine);
10-
11-
var img = this.img = new Image();
12-
13-
img.onload = function () {
14-
done();
15-
};
16-
17-
img.onerror = function () {
18-
fail(img.src + ' failed to load');
19-
done();
20-
};
21-
22-
img.src = this.assetsBasePath + "daisy.png";
23-
23+
2424
/**
2525
* Compare each drawing to a pre-saved base line image.
2626
* Need to has a small tolerance (100),
@@ -47,31 +47,32 @@ beforeEach(function (done) {
4747
done();
4848
};
4949
};
50-
50+
5151
this.merge = function(dest, src) {
5252
for (var n in src) {
5353
dest[n] = src[n];
5454
}
5555
return dest;
5656
}
57+
58+
var img = this.img = new Image();
5759

58-
var customMatchers = {
59-
toBeInRange: function(util, customEqualityTesters) {
60-
return {
61-
compare: function(actual, excpected, range) {
62-
var result = {};
63-
range = range || 0;
60+
img.onload = function () {
61+
done();
62+
};
6463

65-
if (actual <= (excpected + range) && actual >= (excpected - range)) {
66-
result.pass = true;
67-
} else {
68-
result.pass = false;
69-
}
70-
return result;
71-
}
72-
};
73-
}
64+
img.onerror = function () {
65+
fail(img.src + ' failed to load');
66+
done();
7467
};
68+
69+
img.src = "_assets/art/" + "daisy.png";
70+
}, 5000)
7571

72+
beforeEach(function () {
73+
74+
this.stage = new createjs.Stage(imagediff.createCanvas(200, 200));
75+
76+
jasmine.addMatchers(imagediff.jasmine);
7677
jasmine.addMatchers(customMatchers);
7778
});

0 commit comments

Comments
 (0)