pulled all integration tests out of the unit test suite and put them into integrationTests.js. updated test suite index page

tests/js/unit/shapeTests.js

@@ -1,32 +1,4 @@
 Test.Modules.SHAPE = {
-    'scale rect with stroke scale disabled': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var rect = new Kinetic.Rect({
-            x: 200,
-            y: 90,
-            width: 100,
-            height: 50,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            scale: [3, 1],
-            draggable: true,
-            strokeScaleEnabled: false
-        });
-
-        layer.add(rect);
-        stage.add(layer);
-        
-        //console.log(layer.toDataURL());
-        
-        testDataUrl(layer.toDataURL(), 'scaled rect with disabled stroke scale', 'probem with stroke scale disabling');
-    },
-
     'shape color components': function(containerId) {
         var stage = new Kinetic.Stage({
             container: containerId,
@@ -147,50 +119,6 @@ Test.Modules.SHAPE = {
             y: 153
         }) === false, '(303, 153) should not intersect the shape');
 
-    },
-    'custom shape with two fills and two strokes': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-
-        var drawTriangle = function(canvas) {
-            var context = canvas.getContext();
-            context.beginPath();
-            context.moveTo(200, 50);
-            context.lineTo(420, 80);
-            context.quadraticCurveTo(300, 100, 260, 170);
-            context.closePath();
-            canvas.fillStroke(this);
-
-            context.beginPath();
-            context.moveTo(300, 150);
-            context.lineTo(520, 180);
-            context.quadraticCurveTo(400, 200, 360, 270);
-            context.closePath();
-            canvas.fillStroke(this);
-        };
-        var triangle = new Kinetic.Shape({
-            drawFunc: drawTriangle,
-            fill: "#00D2FF",
-            stroke: "black",
-            strokeWidth: 4,
-            id: 'myTriangle',
-            draggable: true,
-            shadowColor: 'black',
-            shadowOpacity: 0.5,
-            shadowBlur: 10,
-            shadowOffset: 10
-        });
-
-        stage.add(layer.add(triangle));
-
-        var dataUrl = layer.toDataURL();
-        //console.log(dataUrl);
-        testDataUrl(dataUrl, 'custom shape with two fills and strokes', 'problem with custom shape with two fills');
-
     },
     'custom shape with fill, stroke, and strokeWidth': function(containerId) {
         var stage = new Kinetic.Stage({
@@ -220,72 +148,6 @@ Test.Modules.SHAPE = {
         layer.add(shape);
         stage.add(layer);
     },
-    'change custom shape draw func': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var shape = new Kinetic.Shape({
-            drawFunc: function(canvas) {
-                var context = canvas.getContext();
-                context.beginPath();
-                context.moveTo(0, 0);
-                context.lineTo(100, 0);
-                context.lineTo(100, 100);
-                context.closePath();
-                canvas.fill(this);
-                canvas.stroke(this);
-            },
-            x: 200,
-            y: 100,
-            fill: 'green',
-            stroke: 'blue',
-            strokeWidth: 5
-        });
-
-        shape.setDrawFunc(function(canvas) {
-            var context = canvas.getContext();
-            context.beginPath();
-            context.moveTo(0, 0);
-            context.lineTo(200, 0);
-            context.lineTo(200, 100);
-            context.closePath();
-            canvas.fill(this);
-            canvas.stroke(this);
-        });
-        var rect = new Kinetic.Rect({
-            x: 10,
-            y: 10,
-            width: 100,
-            height: 50,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            draggable: true
-        });
-
-        rect.setDrawFunc(function(canvas) {
-            var context = canvas.getContext();
-            context.beginPath();
-            context.moveTo(0, 0);
-            context.lineTo(200, 0);
-            context.lineTo(200, 100);
-            context.closePath();
-            canvas.fill(this);
-            canvas.stroke(this);
-        });
-
-        layer.add(shape);
-        layer.add(rect);
-        stage.add(layer);
-
-        var dataUrl = layer.toDataURL();
-
-        //console.log(dataUrl);
-        testDataUrl(dataUrl, 'change custom shape draw func', 'problem with setDrawFunc');
-    },
     'add star with translated, scaled, rotated fill': function(containerId) {
         var imageObj = new Image();
         imageObj.onload = function() {
@@ -439,151 +301,6 @@ Test.Modules.SHAPE = {
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'everything enabled': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var circle = new Kinetic.Circle({
-            x: stage.getWidth() / 2,
-            y: stage.getHeight() / 2,
-            radius: 70,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            shadowColor: 'black',
-            shadowBlur: 10,
-            shadowOffset: 10,
-            dashArray: [10, 10],
-            fillEnabled: true,
-            strokeEnabled: true,
-            shadowEnabled: true,
-            dashArrayEnabled: true
-        });
-        layer.add(circle);
-        stage.add(layer);
-
-        //console.log(layer.toDataURL());
-        testDataUrl(layer.toDataURL(), 'everything enabled', 'should be circle with green fill, dashed stroke, and shadow');
-    },
-    'fill disabled': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var circle = new Kinetic.Circle({
-            x: stage.getWidth() / 2,
-            y: stage.getHeight() / 2,
-            radius: 70,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            shadowColor: 'black',
-            shadowBlur: 10,
-            shadowOffset: 10,
-            dashArray: [10, 10],
-            fillEnabled: false,
-            strokeEnabled: true,
-            shadowEnabled: true,
-            dashArrayEnabled: true
-        });
-        layer.add(circle);
-        stage.add(layer);
-
-        //console.log(layer.toDataURL());
-        testDataUrl(layer.toDataURL(), 'fill disabled', 'should be circle with no fill, dashed stroke, and shadow');
-    },
-    'stroke disabled': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var circle = new Kinetic.Circle({
-            x: stage.getWidth() / 2,
-            y: stage.getHeight() / 2,
-            radius: 70,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            shadowColor: 'black',
-            shadowBlur: 10,
-            shadowOffset: 10,
-            dashArray: [10, 10],
-            fillEnabled: true,
-            strokeEnabled: false,
-            shadowEnabled: true,
-            dashArrayEnabled: true
-        });
-        layer.add(circle);
-        stage.add(layer);
-
-        //console.log(layer.toDataURL());
-        testDataUrl(layer.toDataURL(), 'stroke disabled', 'should be circle with green fill, no stroke, and shadow');
-    },
-    'dash array disabled': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var circle = new Kinetic.Circle({
-            x: stage.getWidth() / 2,
-            y: stage.getHeight() / 2,
-            radius: 70,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            shadowColor: 'black',
-            shadowBlur: 10,
-            shadowOffset: 10,
-            dashArray: [10, 10],
-            fillEnabled: true,
-            strokeEnabled: true,
-            shadowEnabled: true,
-            dashArrayEnabled: false
-        });
-        layer.add(circle);
-        stage.add(layer);
-
-        //console.log(layer.toDataURL());
-        testDataUrl(layer.toDataURL(), 'dash array disabled', 'should be circle with green fill, solid stroke, and shadow');
-    },
-    'shadow disabled': function(containerId) {
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-        var circle = new Kinetic.Circle({
-            x: stage.getWidth() / 2,
-            y: stage.getHeight() / 2,
-            radius: 70,
-            fill: 'green',
-            stroke: 'black',
-            strokeWidth: 4,
-            shadowColor: 'black',
-            shadowBlur: 10,
-            shadowOffset: 10,
-            dashArray: [10, 10],
-            fillEnabled: true,
-            strokeEnabled: true,
-            shadowEnabled: false,
-            dashArrayEnabled: true
-        });
-        layer.add(circle);
-        stage.add(layer);
-
-        //console.log(layer.toDataURL());
-        testDataUrl(layer.toDataURL(), 'shadow disabled', 'should be circle with green fill, dashed stroke, and no shadow');
-    },
     'test enablers and disablers': function(containerId) {
         var stage = new Kinetic.Stage({
             container: containerId,
@@ -669,50 +386,5 @@ Test.Modules.SHAPE = {
         test(circle.getShadowEnabled() === true, 'shadowEnabled should be true');
         test(circle.getDashArrayEnabled() === true, 'dashArrayEnabled should be true');
 
-    },
-    'fill overrides': function(containerId) {
-
-        var stage = new Kinetic.Stage({
-            container: containerId,
-            width: 578,
-            height: 200
-        });
-        var layer = new Kinetic.Layer();
-
-        var star = new Kinetic.Star({
-            x: 200,
-            y: 100,
-            numPoints: 5,
-            innerRadius: 40,
-            outerRadius: 70,
-
-            fill: 'red',
-            fillLinearGradientStartPoint: -35,
-            fillLinearGradientEndPoint: 35,
-            fillLinearGradientColorStops: [0, 'red', 1, 'blue'],
-
-            stroke: 'blue',
-            strokeWidth: 5,
-            draggable: true
-        });
-
-        layer.add(star);
-        stage.add(layer);
-
-        //console.log(layer.toDataURL());
-
-        testDataUrl(layer.toDataURL(), 'red star', 'star should have red fill');
-
-        star.setFillPriority('linear-gradient');
-        layer.draw();
-
-        testDataUrl(layer.toDataURL(), 'star with linear gradient fill', 'star should have linear gradient fill');
-
-        star.setFillPriority('color');
-        layer.draw();
-        
-        testDataUrl(layer.toDataURL(), 'red star', 'star should have red fill again');
-
-
     }
 };