#fi-51 updating repo in package.js; phasing out withSetupTeardown

monfera · monfera · commit f421d4e659d0 · 2016-05-17T10:00:57.000+02:00
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.1",
-    "gl-contour2d": "git://github.com/gl-vis/gl-contour2d.git",
+    "gl-contour2d": "^1.1.2",
     "gl-error2d": "^1.0.0",
     "gl-error3d": "^1.0.0",
     "gl-heatmap2d": "^1.0.2",
diff --git a/test/jasmine/assets/with_setup_teardown.js b/test/jasmine/assets/with_setup_teardown.js
diff --git a/test/jasmine/tests/gl2d_scatterplot_contour_test.js b/test/jasmine/tests/gl2d_scatterplot_contour_test.js
@@ -9,7 +9,10 @@ Plotly.register(
     require('@lib/contourgl')
 );
 
-var withSetupTeardown = require('../assets/with_setup_teardown');
+// Test utilities
+var createGraphDiv = require('../assets/create_graph_div');
+var destroyGraphDiv = require('../assets/destroy_graph_div');
+var failTest = require('../assets/fail_test');
 
 var plotData = {
     'data': [
@@ -158,48 +161,51 @@ var plotDataElliptical = function(maxJitter) {
 };
 
 
-function makePlot(gd, mock) {
-    return Plotly.plot(gd, mock.data, mock.layout);
+function makePlot(gd, mock, done) {
+    return Plotly.plot(gd, mock.data, mock.layout)
+        .then(null, failTest)
+        .then(done);
 }
 
 describe('contourgl plots', function() {
 
+    var gd;
+
+    beforeEach(function() {
+        gd =createGraphDiv();
+    });
+
+    afterEach(function() {
+        Plotly.purge(gd);
+        destroyGraphDiv();
+    });
+
     // this first dataset is a special case, very forgiving to the contour renderer, as it's convex,
     // contains no inflexion points etc.
     it('render without raising an error', function(done) {
-        withSetupTeardown(done, function(gd) {
-            return makePlot(gd, plotData);
-        });
+        makePlot(gd, plotData, done);
     });
 
     it('render without raising an error', function(done) {
         var mock = require('@mocks/gl2d_simple_contour_fill.json');
-        withSetupTeardown(done, function(gd) {
-            return makePlot(gd, mock);
-        });
+        makePlot(gd, mock, done);
     });
 
     it('render without raising an error (coloring: "lines")', function(done) {
         var mock = Lib.extendDeep({}, plotDataElliptical(0));
         mock.data[0].contours.coloring = 'lines'; // 'fill' is the default
-        withSetupTeardown(done, function(gd) {
-            return makePlot(gd, mock);
-        });
+        makePlot(gd, mock, done);
     });
 
     it('render smooth, regular ellipses without raising an error (coloring: "fill")', function(done) {
         var mock = plotDataElliptical(0);
-        withSetupTeardown(done, function(gd) {
-            return makePlot(gd, mock);
-        });
+        makePlot(gd, mock, done);
     });
 
     it('render ellipses with added noise without raising an error (coloring: "fill")', function(done) {
         var mock = plotDataElliptical(0.5);
         mock.data[0].contours.coloring = 'fill'; // 'fill' is the default
         mock.data[0].line = {smoothing: 0};
-        withSetupTeardown(done, function(gd) {
-            return makePlot(gd, mock);
-        });
+        makePlot(gd, mock, done);
     });
 });
diff --git a/test/jasmine/tests/gl_plot_interact_basic_test.js b/test/jasmine/tests/gl_plot_interact_basic_test.js
@@ -1,10 +1,14 @@
 'use strict';
 
 var Plotly = require('@lib/index');
-
-var withSetupTeardown = require('../assets/with_setup_teardown');
 var mouseEvent = require('../assets/mouse_event');
 
+// Test utilities
+var createGraphDiv = require('../assets/create_graph_div');
+var destroyGraphDiv = require('../assets/destroy_graph_div');
+var failTest = require('../assets/fail_test');
+
+
 // Expected shape of projection-related data
 var cameraStructure = {
     up: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
@@ -54,15 +58,26 @@ function testEvents(plot) {
 
 describe('gl3d plots', function() {
 
+    var gd;
+
+    beforeEach(function() {
+        gd =createGraphDiv();
+    });
+
+    afterEach(function() {
+        Plotly.purge(gd);
+        destroyGraphDiv();
+    });
+
     it('should respond to drag interactions with mock of unset camera', function(done) {
-        withSetupTeardown(done, function(gd) {
-            return testEvents(makePlot(gd, require('@mocks/gl3d_scatter3d-connectgaps.json')));
-        });
+        testEvents(makePlot(gd, require('@mocks/gl3d_scatter3d-connectgaps.json')))
+            .then(null, failTest) // current linter balks on .catch with 'dot-notation'; fixme a linter
+            .then(done);
     });
 
     it('should respond to drag interactions with mock of partially set camera', function(done) {
-        withSetupTeardown(done, function(gd) {
-            return testEvents(makePlot(gd, require('@mocks/gl3d_errorbars_zx.json')));
-        });
+        testEvents(makePlot(gd, require('@mocks/gl3d_errorbars_zx.json')))
+            .then(null, failTest)
+            .then(done);
     });
 });
