Skip to content

Commit 092ea18

Browse files
committed
Improve tests for moveAbove() / moveBelow().
1 parent 9497525 commit 092ea18

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

test/lib/helpers.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ QUnit.jsDump.setParser('object', function (obj, stack) {
2727
: objectParser).call(this, obj, stack);
2828
});
2929

30+
function getFunctionBody(func) {
31+
return func.toString().match(
32+
/^\s*function[^\{]*\{([\s\S]*)\}\s*$/)[1]
33+
.replace(/ /g, '')
34+
.replace(/^\s+|\s+$/g, '');
35+
}
36+
3037
// Override equals to convert functions to message and execute them as tests()
3138
function equals(actual, expected, message, tolerance) {
3239
if (typeof actual === 'function') {
3340
if (!message) {
34-
message = actual.toString().match(
35-
/^\s*function[^\{]*\{([\s\S]*)\}\s*$/)[1]
36-
.replace(/ /g, '')
37-
.replace(/^\s+|\s+$/g, '');
41+
message = getFunctionBody(actual);
3842
if (/^return /.test(message)) {
3943
message = message
4044
.replace(/^return /, '')

test/tests/Item_Order.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,18 @@ test('Item Order', function() {
5656

5757
test('Item#moveAbove(item) / Item#moveBelow(item)', function() {
5858
var item0, item1, item2;
59-
var testMove = function(command, indexes) {
59+
60+
function testMove(command, indexes) {
6061
paper.project.clear();
6162
new Layer();
6263
item0 = new Group();
6364
item1 = new Group();
6465
item2 = new Group();
6566
command();
66-
equals(function() {
67-
return item0.index;
68-
}, indexes[0], command.toString());
69-
equals(function() {
70-
return item1.index;
71-
}, indexes[1]);
72-
equals(function() {
73-
return item2.index;
74-
}, indexes[2]);
67+
var str = getFunctionBody(command);
68+
equals(item0.index, indexes[0], str + ': item0.index');
69+
equals(item1.index, indexes[1], str + ': item1.index');
70+
equals(item2.index, indexes[2], str + ': item2.index');
7571
}
7672

7773
testMove(function() { item0.moveBelow(item0) }, [0,1,2]);

0 commit comments

Comments
 (0)