Update tests to require trace modules directly

test/jasmine/tests/choropleth_test.js

@@ -1,11 +1,10 @@
 var Plotly = require('@src/plotly');
+var Choropleth = require('@src/traces/choropleth');
 
 
 describe('Test choropleth', function() {
     'use strict';
 
-    var Choropleth = Plotly.Choropleth;
-
     describe('supplyDefaults', function() {
         var traceIn,
             traceOut;

test/jasmine/tests/colorscale_test.js

@@ -1,5 +1,7 @@
 var Plotly = require('@src/plotly');
 var Colorscale = require('@src/components/colorscale');
+var Heatmap = require('@src/traces/heatmap');
+var Scatter = require('@src/traces/scatter');
 
 
 describe('Test colorscale:', function() {
@@ -191,7 +193,7 @@ describe('Test colorscale:', function() {
         var traceIn, traceOut;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(traceIn, traceOut, Plotly.Heatmap.attributes, attr, dflt);
+            return Plotly.Lib.coerce(traceIn, traceOut, Heatmap.attributes, attr, dflt);
         }
 
         beforeEach(function() {
@@ -261,7 +263,7 @@ describe('Test colorscale:', function() {
         var traceIn, traceOut;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(traceIn, traceOut, Plotly.Scatter.attributes, attr, dflt);
+            return Plotly.Lib.coerce(traceIn, traceOut, Scatter.attributes, attr, dflt);
         }
 
         beforeEach(function() {

test/jasmine/tests/contour_test.js

@@ -1,4 +1,5 @@
-var Plotly = require('@src/plotly');
+var Plots = require('@src/plots/plots');
+var Contour = require('@src/traces/contour');
 
 
 describe('Test contour', function() {
@@ -10,10 +11,10 @@ describe('Test contour', function() {
 
         var defaultColor = '#444',
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             };
 
-        var supplyDefaults = Plotly.Contour.supplyDefaults;
+        var supplyDefaults = Contour.supplyDefaults;
 
         beforeEach(function() {
             traceOut = {};

test/jasmine/tests/heatmap_test.js

@@ -1,6 +1,6 @@
-var Plotly = require('@src/plotly');
-var Heatmap = require('@src/traces/heatmap');
 var convertColumnXYZ = require('@src/traces/heatmap/convert_column_xyz');
+var Heatmap = require('@src/traces/heatmap');
+var Plots = require('@src/plots/plots');
 
 
 describe('Test heatmap', function() {
@@ -12,7 +12,7 @@ describe('Test heatmap', function() {
 
         var defaultColor = '#444',
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             };
 
         var supplyDefaults = Heatmap.supplyDefaults;
@@ -44,13 +44,13 @@ describe('Test heatmap', function() {
                 type: 'heatmap',
                 z: [[1, 2], []]
             };
-            traceOut = Plotly.Plots.supplyDataDefaults(traceIn, 0, layout);
+            traceOut = Plots.supplyDataDefaults(traceIn, 0, layout);
 
             traceIn = {
                 type: 'heatmap',
                 z: [[], [1, 2], [1, 2, 3]]
             };
-            traceOut = Plotly.Plots.supplyDataDefaults(traceIn, 0, layout);
+            traceOut = Plots.supplyDataDefaults(traceIn, 0, layout);
             expect(traceOut.visible).toBe(true);
             expect(traceOut.visible).toBe(true);
         });

test/jasmine/tests/plot_api_test.js

@@ -1,20 +1,24 @@
 var Plotly = require('@src/plotly');
+var Plots = require('@src/plots/plots');
+var Scatter = require('@src/traces/scatter');
+var Bar = require('@src/traces/bar');
+var Legend = require('@src/components/legend');
 
 describe('Test graph_obj', function() {
     'use strict';
 
     describe('Plotly.restyle', function() {
         beforeEach(function() {
-            spyOn(Plotly.Plots, 'previousPromises');
             spyOn(Plotly, 'plot');
-            spyOn(Plotly.Scatter, 'arraysToCalcdata');
-            spyOn(Plotly.Bar, 'arraysToCalcdata');
-            spyOn(Plotly.Plots, 'style');
-            spyOn(Plotly.Legend, 'draw');
+            spyOn(Plots, 'previousPromises');
+            spyOn(Scatter, 'arraysToCalcdata');
+            spyOn(Bar, 'arraysToCalcdata');
+            spyOn(Plots, 'style');
+            spyOn(Legend, 'draw');
         });
 
         function mockDefaultsAndCalc(gd) {
-            Plotly.Plots.supplyDefaults(gd);
+            Plots.supplyDefaults(gd);
             gd.calcdata = gd._fullData.map(function(trace) {
                 return [{x: 1, y: 1, trace: trace}];
             });
@@ -27,9 +31,9 @@ describe('Test graph_obj', function() {
             };
             mockDefaultsAndCalc(gd);
             Plotly.restyle(gd, {'marker.color': 'red'});
-            expect(Plotly.Scatter.arraysToCalcdata).toHaveBeenCalled();
-            expect(Plotly.Bar.arraysToCalcdata).not.toHaveBeenCalled();
-            expect(Plotly.Plots.style).toHaveBeenCalled();
+            expect(Scatter.arraysToCalcdata).toHaveBeenCalled();
+            expect(Bar.arraysToCalcdata).not.toHaveBeenCalled();
+            expect(Plots.style).toHaveBeenCalled();
             expect(Plotly.plot).not.toHaveBeenCalled();
             // "docalc" deletes gd.calcdata - make sure this didn't happen
             expect(gd.calcdata).toBeDefined();
@@ -42,9 +46,9 @@ describe('Test graph_obj', function() {
             };
             mockDefaultsAndCalc(gd);
             Plotly.restyle(gd, {'marker.color': 'red'});
-            expect(Plotly.Scatter.arraysToCalcdata).not.toHaveBeenCalled();
-            expect(Plotly.Bar.arraysToCalcdata).toHaveBeenCalled();
-            expect(Plotly.Plots.style).toHaveBeenCalled();
+            expect(Scatter.arraysToCalcdata).not.toHaveBeenCalled();
+            expect(Bar.arraysToCalcdata).toHaveBeenCalled();
+            expect(Plots.style).toHaveBeenCalled();
             expect(Plotly.plot).not.toHaveBeenCalled();
             expect(gd.calcdata).toBeDefined();
         });

test/jasmine/tests/plots_test.js

@@ -1,17 +1,19 @@
 var Plotly = require('@src/plotly');
+var Plots = require('@src/plots/plots');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 
 
-describe('Test Plotly.Plots', function() {
+
+describe('Test Plots', function() {
     'use strict';
 
-    describe('Plotly.Plots.supplyLayoutGlobalDefaults should', function() {
+    describe('Plots.supplyLayoutGlobalDefaults should', function() {
         var layoutIn,
             layoutOut,
             expected;
 
-        var supplyLayoutDefaults = Plotly.Plots.supplyLayoutGlobalDefaults;
+        var supplyLayoutDefaults = Plots.supplyLayoutGlobalDefaults;
 
         beforeEach(function() {
             layoutOut = {};
@@ -65,8 +67,8 @@ describe('Test Plotly.Plots', function() {
 
     });
 
-    describe('Plotly.Plots.supplyDataDefaults', function() {
-        var supplyDataDefaults = Plotly.Plots.supplyDataDefaults,
+    describe('Plots.supplyDataDefaults', function() {
+        var supplyDataDefaults = Plots.supplyDataDefaults,
             layout = {};
 
         var traceIn, traceOut;
@@ -98,8 +100,8 @@ describe('Test Plotly.Plots', function() {
         });
     });
 
-    describe('Plotly.Plots.getSubplotIds', function() {
-        var getSubplotIds = Plotly.Plots.getSubplotIds;
+    describe('Plots.getSubplotIds', function() {
+        var getSubplotIds = Plots.getSubplotIds;
         var layout;
 
         it('returns scene ids', function() {
@@ -143,8 +145,8 @@ describe('Test Plotly.Plots', function() {
         });
     });
 
-    describe('Plotly.Plots.getSubplotIdsInData', function() {
-        var getSubplotIdsInData = Plotly.Plots.getSubplotIdsInData;
+    describe('Plots.getSubplotIdsInData', function() {
+        var getSubplotIdsInData = Plots.getSubplotIdsInData;
 
         var ids, data;
 
@@ -173,11 +175,11 @@ describe('Test Plotly.Plots', function() {
 
     });
 
-    describe('Plotly.Plots.register, getModule, and traceIs', function() {
+    describe('Plots.register, getModule, and traceIs', function() {
         beforeEach(function() {
-            this.modulesKeys = Object.keys(Plotly.Plots.modules);
-            this.allTypesKeys = Object.keys(Plotly.Plots.allTypes);
-            this.allCategoriesKeys = Object.keys(Plotly.Plots.allCategories);
+            this.modulesKeys = Object.keys(Plots.modules);
+            this.allTypesKeys = Object.keys(Plots.allTypes);
+            this.allCategoriesKeys = Object.keys(Plots.allCategories);
 
             this.fakeModule = {
                 calc: function() { return 42; },
@@ -187,7 +189,7 @@ describe('Test Plotly.Plots', function() {
                 plot: function() { throw new Error('nope!'); }
             };
 
-            Plotly.Plots.register(this.fakeModule, 'newtype', ['red', 'green']);
+            Plots.register(this.fakeModule, 'newtype', ['red', 'green']);
 
             spyOn(console, 'warn');
         });
@@ -199,52 +201,50 @@ describe('Test Plotly.Plots', function() {
                 });
             }
 
-            revertObj(Plotly.Plots.modules, this.modulesKeys);
-            revertObj(Plotly.Plots.allTypes, this.allTypesKeys);
-            revertObj(Plotly.Plots.allCategories, this.allCategoriesKeys);
+            revertObj(Plots.modules, this.modulesKeys);
+            revertObj(Plots.allTypes, this.allTypesKeys);
+            revertObj(Plots.allCategories, this.allCategoriesKeys);
         });
 
-        it('should error on attempts to reregister a type', function() {
-            var fm2 = this.fakeModule2;
-            expect(function() { Plotly.Plots.register(fm2, 'newtype', ['yellow', 'blue']); })
-                .toThrow(new Error('type newtype already registered'));
-            expect(Plotly.Plots.allCategories.yellow).toBeUndefined();
+        it('should warn on attempts to reregister a type', function() {
+            Plots.register(this.fakeModule2, 'newtype', ['yellow', 'blue']);
+            expect(Plots.allCategories.yellow).toBeUndefined();
         });
 
         it('should find the module for a type', function() {
-            expect(Plotly.Plots.getModule('newtype')).toBe(this.fakeModule);
-            expect(Plotly.Plots.getModule({type: 'newtype'})).toBe(this.fakeModule);
+            expect(Plots.getModule('newtype')).toBe(this.fakeModule);
+            expect(Plots.getModule({type: 'newtype'})).toBe(this.fakeModule);
         });
 
         it('should return false for types it doesn\'t know', function() {
-            expect(Plotly.Plots.getModule('notatype')).toBe(false);
-            expect(Plotly.Plots.getModule({type: 'notatype'})).toBe(false);
-            expect(Plotly.Plots.getModule({type: 'newtype', r: 'this is polar'})).toBe(false);
+            expect(Plots.getModule('notatype')).toBe(false);
+            expect(Plots.getModule({type: 'notatype'})).toBe(false);
+            expect(Plots.getModule({type: 'newtype', r: 'this is polar'})).toBe(false);
         });
 
         it('should find the categories for this type', function() {
-            expect(Plotly.Plots.traceIs('newtype', 'red')).toBe(true);
-            expect(Plotly.Plots.traceIs({type: 'newtype'}, 'red')).toBe(true);
+            expect(Plots.traceIs('newtype', 'red')).toBe(true);
+            expect(Plots.traceIs({type: 'newtype'}, 'red')).toBe(true);
         });
 
         it('should not find other real categories', function() {
-            expect(Plotly.Plots.traceIs('newtype', 'cartesian')).toBe(false);
-            expect(Plotly.Plots.traceIs({type: 'newtype'}, 'cartesian')).toBe(false);
+            expect(Plots.traceIs('newtype', 'cartesian')).toBe(false);
+            expect(Plots.traceIs({type: 'newtype'}, 'cartesian')).toBe(false);
             expect(console.warn).not.toHaveBeenCalled();
         });
     });
 
-    describe('Plotly.Plots.registerSubplot', function() {
+    describe('Plots.registerSubplot', function() {
         var fake = {
             name: 'fake',
             attr: 'abc',
             idRoot: 'cba',
             attributes: { stuff: { 'more stuff': 102102 } }
         };
 
-        Plotly.Plots.registerSubplot(fake);
+        Plots.registerSubplot(fake);
 
-        var subplotsRegistry = Plotly.Plots.subplotsRegistry;
+        var subplotsRegistry = Plots.subplotsRegistry;
 
         it('should register attr, idRoot and attributes', function() {
             expect(subplotsRegistry.fake.attr).toEqual('abc');
@@ -307,7 +307,7 @@ describe('Test Plotly.Plots', function() {
 
     });
 
-    describe('Plotly.Plots.purge', function() {
+    describe('Plots.purge', function() {
         var gd;
 
         beforeEach(function(done) {
@@ -324,7 +324,7 @@ describe('Test Plotly.Plots', function() {
                 '_hmpixcount', '_hmlumcount'
             ];
 
-            Plotly.Plots.purge(gd);
+            Plots.purge(gd);
             expect(Object.keys(gd)).toEqual(expectedKeys);
             expect(gd.data).toBeUndefined();
             expect(gd.layout).toBeUndefined();

test/jasmine/tests/scattergeo_test.js

@@ -1,10 +1,8 @@
-var Plotly = require('@src/plotly');
+var ScatterGeo = require('@src/traces/scattergeo');
 
 describe('Test scattergeo', function() {
     'use strict';
 
-    var ScatterGeo = Plotly.ScatterGeo;
-
     describe('supplyDefaults', function() {
         var traceIn,
             traceOut;