#30a PR feedback: not expose scene id and use axis names. Plus: test the data structure of the callback.

Author: monfera

src/plots/gl2d/scene2d.js

@@ -271,20 +271,19 @@ proto.updateFx = function(options) {
 
 var relayoutCallback = function(scene) {
 
-    var update = {},
-        xrange = scene.xaxis.range,
+    var xrange = scene.xaxis.range,
         yrange = scene.yaxis.range;
 
     // Update the layout on the DIV
     scene.graphDiv.layout.xaxis.range = xrange.slice(0);
     scene.graphDiv.layout.yaxis.range = yrange.slice(0);
 
     // Make a meaningful value to be passed on to the possible 'plotly_relayout' subscriber(s)
-    update[scene.id] = { // scene.camera has no many useful projection or scale information
-        lastInputTime: scene.camera.lastInputTime, // helps determine which one is the latest input (if async)
-        xrange: xrange.slice(0),
-        yrange: yrange.slice(0)
+    var update = { // scene.camera has no many useful projection or scale information
+        lastInputTime: scene.camera.lastInputTime // helps determine which one is the latest input (if async)
     };
+    update[scene.xaxis._name] = xrange.slice();
+    update[scene.yaxis._name] = yrange.slice();
 
     scene.graphDiv.emit('plotly_relayout', update);
 };

test/jasmine/tests/gl_plot_interact_test.js

@@ -310,7 +310,15 @@ describe('Test gl plot interactions', function() {
 
                 setTimeout(function() {
 
-                    expect(relayoutCallback).toHaveBeenCalledTimes(6); // X and back; Y and back; XY and back
+                    // callback count expectation: X and back; Y and back; XY and back
+                    expect(relayoutCallback).toHaveBeenCalledTimes(6);
+
+                    // a callback value structure and contents check
+                    expect(relayoutCallback).toHaveBeenCalledWith(jasmine.objectContaining({
+                        lastInputTime: jasmine.any(Number),
+                        xaxis: [jasmine.any(Number), jasmine.any(Number)],
+                        yaxis: [jasmine.any(Number), jasmine.any(Number)]
+                    }));
 
                     done();