#30a PR feedback: adding test case with partially set camera and solving it; test case refactor for multiple mocks, fewer globals and explicit async steps

Author: monfera

src/plots/gl3d/scene.js

@@ -624,7 +624,7 @@ proto.saveCamera = function saveCamera(layout) {
     function same(x, y, i, j) {
         var vectors = ['up', 'center', 'eye'],
             components = ['x', 'y', 'z'];
-        return x[vectors[i]][components[j]] === y[vectors[i]][components[j]];
+        return y[vectors[i]] && (x[vectors[i]][components[j]] === y[vectors[i]][components[j]]);
     }
 
     if(cameraDataLastSave === undefined) hasChanged = true;

test/jasmine/tests/gl_plot_interact_test.js

@@ -213,52 +213,63 @@ describe('Test gl plot interactions', function() {
 
     describe('gl3d plots', function() {
 
-        var mock = require('@mocks/gl3d_scatter3d-connectgaps.json'),
-            relayoutCallback;
+        // Expected shape of projection-related data
+        var cameraStructure = {
+            up: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
+            center: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
+            eye: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)}
+        };
+
+        function makePlot(mock) {
+            return Plotly.plot(createGraphDiv(), mock.data, mock.layout);
+        }
 
-        beforeEach(function(done) {
-            gd = createGraphDiv();
+        function addEventCallback(graphDiv) {
+            var relayoutCallback = jasmine.createSpy('relayoutCallback');
+            graphDiv.on('plotly_relayout', relayoutCallback);
+            return {graphDiv: graphDiv, relayoutCallback: relayoutCallback};
+        }
 
-            Plotly.plot(gd, mock.data, mock.layout).then(function() {
+        function verifyInteractionEffects(tuple) {
 
-                relayoutCallback = jasmine.createSpy('relayoutCallback');
+            // One 'drag': simulating fairly thoroughly as the mouseup event is also needed here
+            mouseEvent('mousemove', 400, 200);
+            mouseEvent('mousedown', 400, 200);
+            mouseEvent('mousemove', 320, 320, {buttons: 1});
+            mouseEvent('mouseup', 320, 320);
 
-                gd.on('plotly_relayout', relayoutCallback);
+            // Check event emission count
+            expect(tuple.relayoutCallback).toHaveBeenCalledTimes(1);
 
-                delay(done);
-            });
-        });
+            // Check structure of event callback value contents
+            expect(tuple.relayoutCallback).toHaveBeenCalledWith(jasmine.objectContaining({scene: cameraStructure}));
 
-        it('should respond to drag interactions', function(done) {
+            // Check camera contents on the DIV layout
+            var divCamera = tuple.graphDiv.layout.scene.camera;
 
-            // Expected shape of projection-related data
-            var cameraStructure = {
-                up: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
-                center: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
-                eye: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)}
-            };
-
-            setTimeout(function() {
+            expect(divCamera).toEqual(cameraStructure);
 
-                // One 'drag': simulating fairly thoroughly as the mouseup event is also needed here
-                mouseEvent('mousemove', 400, 200);
-                mouseEvent('mousedown', 400, 200);
-                mouseEvent('mousemove', 320, 320, {buttons: 1});
-                mouseEvent('mouseup', 320, 320);
-
-                // Check event emission count
-                expect(relayoutCallback).toHaveBeenCalledTimes(1);
+            return tuple.graphDiv;
+        }
 
-                // Check structure of event callback value contents
-                expect(relayoutCallback).toHaveBeenCalledWith(jasmine.objectContaining({scene: cameraStructure}));
+        function markForTeardown(graphDiv) {
+            // TODO consider changing this test file such that the teardown needs no communication via a global variable
+            gd = graphDiv;
+        }
 
-                // Check camera contents on the DIV layout
-                var divCamera = gd.layout.scene.camera;
-                expect(divCamera).toEqual(cameraStructure);
+        function testEvents(plot, done) {
+            plot.then(addEventCallback)
+                .then(verifyInteractionEffects)
+                .then(markForTeardown)
+                .then(done);
+        }
 
-                delay(done);
+        it('should respond to drag interactions with mock of unset camera', function(done) {
+            testEvents(makePlot(require('@mocks/gl3d_scatter3d-connectgaps.json')), done);
+        });
 
-            }, MODEBAR_DELAY);
+        it('should respond to drag interactions with mock of partially set camera', function(done) {
+            testEvents(makePlot(require('@mocks/gl3d_errorbars_zx.json')), done);
         });
     });