use bg rect instead of grids for assertPlotSize

Author: alexcjohnson

test/jasmine/assets/custom_assertions.js

@@ -232,8 +232,9 @@ exports.assertPlotSize = function(opts, msg) {
     var widthLessThan = opts.widthLessThan;
     var heightLessThan = opts.heightLessThan;
 
-    var actualWidth = d3.select('.ygrid').node().getBoundingClientRect().width;
-    var actualHeight = d3.select('.xgrid').node().getBoundingClientRect().height;
+    var plotBB = d3.select('.bglayer .bg').node().getBoundingClientRect();
+    var actualWidth = plotBB.width;
+    var actualHeight = plotBB.height;
 
     var msgPlus = msg ? ': ' + msg : '';
 

test/jasmine/tests/colorbar_test.js

@@ -5,6 +5,7 @@ var Colorbar = require('@src/components/colorbar');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var failTest = require('../assets/fail_test');
+var assertPlotSize = require('../assets/custom_assertions').assertPlotSize;
 
 
 describe('Test colorbar:', function() {
@@ -127,11 +128,7 @@ describe('Test colorbar:', function() {
                 var colorbars = d3.select(gd).selectAll('.colorbar');
                 expect(colorbars.size()).toBe(present ? 1 : 0);
 
-                var yLines = d3.select(gd).selectAll('.ygrid');
-                expect(yLines.size()).toBeGreaterThan(0);
-                var yLineWidth = +yLines.node().getBoundingClientRect().width;
-                if(expandedMargin) expect(yLineWidth).toBeLessThan(400);
-                else expect(yLineWidth).toBe(400);
+                assertPlotSize(expandedMargin ? {widthLessThan: 400} : {width: 400});
             }
 
             Plotly.newPlot(gd, [{
@@ -170,11 +167,7 @@ describe('Test colorbar:', function() {
                 var colorbars = d3.select(gd).selectAll('.colorbar');
                 expect(colorbars.size()).toBe(present ? 1 : 0);
 
-                var yLines = d3.select(gd).selectAll('.ygrid');
-                expect(yLines.size()).toBeGreaterThan(0);
-                var yLineWidth = +yLines.node().getBoundingClientRect().width;
-                if(expandedMargin) expect(yLineWidth).toBeLessThan(400);
-                else expect(yLineWidth).toBe(400);
+                assertPlotSize(expandedMargin ? {widthLessThan: 400} : {width: 400});
             }
 
             Plotly.newPlot(gd, [{