Merge pull request #445 from andrewDyakin/master

Tests cleanup
This commit is contained in:
Anton Lavrenov 2018-09-04 22:51:40 +03:00 committed by GitHub
commit f89a850b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 210 additions and 210 deletions

View File

@ -1780,7 +1780,7 @@ suite('MouseEvents', function() {
assert.equal(shape, circle);
});
it('double click after click should trigger event', function(done) {
test('double click after click should trigger event', function(done) {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
@ -1865,7 +1865,7 @@ suite('MouseEvents', function() {
});
});
it('double click after drag should trigger event', function(done) {
test('double click after drag should trigger event', function(done) {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);

View File

@ -451,7 +451,7 @@ suite('Layer', function() {
);
});
it('get/set layer size', function() {
test('get/set layer size', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);

View File

@ -3530,209 +3530,209 @@ suite('Node', function() {
assert.equal(rect.findAncestor(), null, 'return null if no selector');
});
});
test('moveToTop() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect2.moveToTop();
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect2.getZIndex(), 3);
rect1.moveToTop();
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect4.getZIndex(), 1);
assert.equal(rect2.getZIndex(), 2);
assert.equal(rect1.getZIndex(), 3);
});
test('moveToBottom() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect3.moveToBottom();
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect2.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.moveToBottom();
assert.equal(rect4.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect1.getZIndex(), 2);
assert.equal(rect2.getZIndex(), 3);
});
test('moveUp() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect1.moveUp();
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect3.moveUp();
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect3.getZIndex(), 3);
});
test('moveDown() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.moveDown();
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect3.getZIndex(), 3);
rect2.moveDown();
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect3.getZIndex(), 3);
});
test('setZIndex() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect1.setZIndex(2);
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect1.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect2.setZIndex(3);
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect2.getZIndex(), 3);
rect2.setZIndex(1);
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect1.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.setZIndex(0);
assert.equal(rect4.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect2.getZIndex(), 2);
assert.equal(rect1.getZIndex(), 3);
});
test('remove() removes the node and properly changes z-indices of its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(layer.getChildren().length, 4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.remove();
assert.equal(layer.getChildren().length, 3);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
rect2.remove();
assert.equal(layer.getChildren().length, 2);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
rect1.remove();
assert.equal(layer.getChildren().length, 1);
assert.equal(rect3.getZIndex(), 0);
test('moveToTop() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect2.moveToTop();
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect2.getZIndex(), 3);
rect1.moveToTop();
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect4.getZIndex(), 1);
assert.equal(rect2.getZIndex(), 2);
assert.equal(rect1.getZIndex(), 3);
});
test('moveToBottom() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect3.moveToBottom();
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect2.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.moveToBottom();
assert.equal(rect4.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect1.getZIndex(), 2);
assert.equal(rect2.getZIndex(), 3);
});
test('moveUp() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect1.moveUp();
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect3.moveUp();
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect3.getZIndex(), 3);
});
test('moveDown() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.moveDown();
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect3.getZIndex(), 3);
rect2.moveDown();
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect3.getZIndex(), 3);
});
test('setZIndex() properly changes z-indices of the node and its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect1.setZIndex(2);
assert.equal(rect2.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect1.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect2.setZIndex(3);
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect1.getZIndex(), 1);
assert.equal(rect4.getZIndex(), 2);
assert.equal(rect2.getZIndex(), 3);
rect2.setZIndex(1);
assert.equal(rect3.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect1.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.setZIndex(0);
assert.equal(rect4.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
assert.equal(rect2.getZIndex(), 2);
assert.equal(rect1.getZIndex(), 3);
});
test('remove() removes the node and properly changes z-indices of its siblings', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect1 = new Konva.Rect();
var rect2 = new Konva.Rect();
var rect3 = new Konva.Rect();
var rect4 = new Konva.Rect();
layer.add(rect1, rect2, rect3, rect4);
assert.equal(layer.getChildren().length, 4);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
assert.equal(rect4.getZIndex(), 3);
rect4.remove();
assert.equal(layer.getChildren().length, 3);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect2.getZIndex(), 1);
assert.equal(rect3.getZIndex(), 2);
rect2.remove();
assert.equal(layer.getChildren().length, 2);
assert.equal(rect1.getZIndex(), 0);
assert.equal(rect3.getZIndex(), 1);
rect1.remove();
assert.equal(layer.getChildren().length, 1);
assert.equal(rect3.getZIndex(), 0);
});
});

View File

@ -243,7 +243,7 @@ suite('Label', function() {
cloneAndCompareLayer(layer, 100);
});
it('tag should list text size changes', function() {
test('tag should list text size changes', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);

View File

@ -1140,7 +1140,7 @@ suite('Path', function() {
);
});
it('getClientRect', function() {
test('getClientRect', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);