use 'official' Plotly in test suite,

  instead of internal Plotly

Author: etpinard

test/jasmine/tests/choropleth_test.js

@@ -1,5 +1,5 @@
-var Plotly = require('@src/plotly');
 var Choropleth = require('@src/traces/choropleth');
+var Plots = require('@src/plots/plots');
 
 
 describe('Test choropleth', function() {
@@ -11,7 +11,7 @@ describe('Test choropleth', function() {
 
         var defaultColor = '#444',
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             };
 
         beforeEach(function() {

test/jasmine/tests/color_test.js

@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Color = require('@src/components/color');
 
 
 describe('Test color:', function() {
@@ -15,7 +15,7 @@ describe('Test color:', function() {
                 rgbacolor: 'rgba(51, 102, 153, 0.8)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -51,7 +51,7 @@ describe('Test color:', function() {
                 ]
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -70,7 +70,7 @@ describe('Test color:', function() {
                 fractionrgbacolor: 'rgba(0, 102, 204, 1)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -86,7 +86,7 @@ describe('Test color:', function() {
                 rgbacolor: 'rgba(51, 102, 153, 0.8)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -102,7 +102,7 @@ describe('Test color:', function() {
                 rgba2color: 'rgba(26, 51, 128, 1)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -117,15 +117,15 @@ describe('Test color:', function() {
             var expectedContainer = {};
             Object.keys(container).forEach(function(k) { expectedContainer[k] = container[k]; });
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
         it('should not barf on nulls', function() {
             var container1 = null;
             var expectedContainer1 = null;
 
-            Plotly.Color.clean(container1);
+            Color.clean(container1);
             expect(container1).toEqual(expectedContainer1);
 
             var container2 = {
@@ -141,7 +141,7 @@ describe('Test color:', function() {
                 anarray: [null, {color: 'rgb(0.1, 0.1, 0.1)'}]
             };
 
-            Plotly.Color.clean(container2);
+            Color.clean(container2);
             expect(container2).toEqual(expectedContainer2);
         });
     });

test/jasmine/tests/colorscale_test.js

@@ -1,5 +1,6 @@
-var Plotly = require('@src/plotly');
 var Colorscale = require('@src/components/colorscale');
+var Lib = require('@src/lib');
+var Plots = require('@src/plots/plots');
 var Heatmap = require('@src/traces/heatmap');
 var Scatter = require('@src/traces/scatter');
 
@@ -187,13 +188,13 @@ describe('Test colorscale:', function() {
     describe('handleDefaults (heatmap-like version)', function() {
         var handleDefaults = Colorscale.handleDefaults,
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             },
             opts = {prefix: '', cLetter: 'z'};
         var traceIn, traceOut;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(traceIn, traceOut, Heatmap.attributes, attr, dflt);
+            return Lib.coerce(traceIn, traceOut, Heatmap.attributes, attr, dflt);
         }
 
         beforeEach(function() {
@@ -257,13 +258,13 @@ describe('Test colorscale:', function() {
     describe('handleDefaults (scatter-like version)', function() {
         var handleDefaults = Colorscale.handleDefaults,
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             },
             opts = {prefix: 'marker.', cLetter: 'c'};
         var traceIn, traceOut;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(traceIn, traceOut, Scatter.attributes, attr, dflt);
+            return Lib.coerce(traceIn, traceOut, Scatter.attributes, attr, dflt);
         }
 
         beforeEach(function() {

test/jasmine/tests/config_test.js

@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Plotly = require('@lib/index');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 

test/jasmine/tests/is_plain_object_test.js

@@ -1,9 +1,9 @@
-var Plotly = require('@src/plotly');
+var Lib = require('@src/lib');
 
 describe('isPlainObject', function() {
     'use strict';
 
-    var isPlainObject = Plotly.Lib.isPlainObject;
+    var isPlainObject = Lib.isPlainObject;
 
     function A() {}
 

test/jasmine/tests/legend_test.js

@@ -1,10 +1,11 @@
-var Plotly = require('@src/plotly');
+var Legend = require('@src/components/legend');
+var Plots = require('@src/plots/plots');
 
 describe('Test legend:', function() {
     'use strict';
 
     describe('supplyLayoutDefaults', function() {
-        var supplyLayoutDefaults = Plotly.Legend.supplyLayoutDefaults;
+        var supplyLayoutDefaults = Legend.supplyLayoutDefaults;
 
         var layoutIn, layoutOut, fullData;
 
@@ -13,8 +14,8 @@ describe('Test legend:', function() {
                 showlegend: true
             };
             layoutOut = {
-                font: Plotly.Plots.layoutAttributes.font,
-                bg_color: Plotly.Plots.layoutAttributes.bg_color
+                font: Plots.layoutAttributes.font,
+                bg_color: Plots.layoutAttributes.bg_color
             };
         });
 
@@ -62,7 +63,7 @@ describe('Test legend:', function() {
     });
 
     describe('getLegendData', function() {
-        var getLegendData = Plotly.Legend.getLegendData;
+        var getLegendData = Legend.getLegendData;
 
         var calcdata, opts, legendData, expected;