Merge pull request #425 from plotly/karma-individual-tests

Single suite karma/jasmine tests

Author: etpinard

src/components/annotations/attributes.js

@@ -9,8 +9,8 @@
 'use strict';
 
 var ARROWPATHS = require('./arrow_paths');
-var Cartesian = require('../../plots/cartesian');
 var fontAttrs = require('../../plots/font_attributes');
+var cartesianConstants = require('../../plots/cartesian/constants');
 var extendFlat = require('../../lib/extend').extendFlat;
 
 
@@ -156,7 +156,7 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'paper',
-            Cartesian.idRegex.x.toString()
+            cartesianConstants.idRegex.x.toString()
         ],
         role: 'info',
         description: [
@@ -199,7 +199,7 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'paper',
-            Cartesian.idRegex.y.toString()
+            cartesianConstants.idRegex.y.toString()
         ],
         role: 'info',
         description: [

src/plots/cartesian/constants.js

@@ -10,6 +10,17 @@
 
 
 module.exports = {
+
+    idRegex: {
+        x: /^x([2-9]|[1-9][0-9]+)?$/,
+        y: /^y([2-9]|[1-9][0-9]+)?$/
+    },
+
+    attrRegex: {
+        x: /^xaxis([2-9]|[1-9][0-9]+)?$/,
+        y: /^yaxis([2-9]|[1-9][0-9]+)?$/
+    },
+
     /**
      * standardize all missing data in calcdata to use undefined
      * never null or NaN.

src/plots/cartesian/index.js

@@ -12,23 +12,19 @@
 var Lib = require('../../lib');
 var Plots = require('../plots');
 
+var constants = require('./constants');
+
 exports.name = 'cartesian';
 
 exports.attr = ['xaxis', 'yaxis'];
 
 exports.idRoot = ['x', 'y'];
 
-exports.attributes = require('./attributes');
+exports.idRegex = constants.idRegex;
 
-exports.idRegex = {
-    x: /^x([2-9]|[1-9][0-9]+)?$/,
-    y: /^y([2-9]|[1-9][0-9]+)?$/
-};
+exports.attrRegex = constants.attrRegex;
 
-exports.attrRegex = {
-    x: /^xaxis([2-9]|[1-9][0-9]+)?$/,
-    y: /^yaxis([2-9]|[1-9][0-9]+)?$/
-};
+exports.attributes = require('./attributes');
 
 exports.plot = function(gd) {
     var fullLayout = gd._fullLayout,

src/plots/cartesian/layout_attributes.js

@@ -8,13 +8,14 @@
 
 'use strict';
 
-var Cartesian = require('./index');
 var fontAttrs = require('../font_attributes');
 var colorAttrs = require('../../components/color/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 var rangeSliderAttrs = require('../../components/rangeslider/attributes');
 var rangeSelectorAttrs = require('../../components/rangeselector/attributes');
 
+var constants = require('./constants');
+
 
 module.exports = {
     color: {
@@ -402,8 +403,8 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'free',
-            Cartesian.idRegex.x.toString(),
-            Cartesian.idRegex.y.toString()
+            constants.idRegex.x.toString(),
+            constants.idRegex.y.toString()
         ],
         role: 'info',
         description: [
@@ -431,8 +432,8 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'free',
-            Cartesian.idRegex.x.toString(),
-            Cartesian.idRegex.y.toString()
+            constants.idRegex.x.toString(),
+            constants.idRegex.y.toString()
         ],
         role: 'info',
         description: [

test/jasmine/karma.conf.js

@@ -12,7 +12,14 @@
  * will only run the tests in axes_test.js
  *
  */
-var testFileGlob = process.argv[4] ? process.argv[4] : 'tests/*_test.js';
+
+var arg = process.argv[4];
+
+var testFileGlob = arg ? arg : 'tests/*_test.js';
+var isSingleSuiteRun = (arg && arg.indexOf('bundle_tests/') === -1);
+
+var pathToMain = '../../lib/index.js';
+var pathToJQuery = 'assets/jquery-1.8.3.min.js';
 
 
 function func(config) {
@@ -34,10 +41,9 @@ func.defaultConfig = {
     frameworks: ['jasmine', 'browserify'],
 
     // list of files / patterns to load in the browser
-    files: [
-        'assets/jquery-1.8.3.min.js',
-        testFileGlob
-    ],
+    //
+    // N.B. this field is filled below
+    files: [],
 
     exclude: [],
 
@@ -77,7 +83,27 @@ func.defaultConfig = {
     }
 };
 
-// browserify the test files
-func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
+
+// Add lib/index.js to single-suite runs,
+// to avoid import conflicts due to plotly.js
+// circular dependencies.
+if(isSingleSuiteRun) {
+    func.defaultConfig.files = [
+        pathToJQuery,
+        pathToMain,
+        testFileGlob
+    ];
+
+    func.defaultConfig.preprocessors[pathToMain] = ['browserify'];
+    func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
+}
+else {
+    func.defaultConfig.files = [
+        pathToJQuery,
+        testFileGlob
+    ];
+
+    func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
+}
 
 module.exports = func;