Merge pull request #2 from jbubsk/entry-files

feat(entry files): allows to redefine sets of the specs for distribut…

README.md

@@ -23,10 +23,18 @@ You can pass configuration to override these defaults:
 {
   sharding: {
     specMatcher: /(spec|test)s?\.js/i,
-    base: '/base'
+    base: '/base',
+    getSets: function(config, basePath, files) {
+        // splitForBrowsers - some util function
+        return splitForBrowsers(files.served)
+            .map(oneBrowserSet => [someInitScript].concat(oneBrowserSet));
+    }
   }
 }
 ```
+`getSets` might be overridden when files from `karma.files` config should be organized in certain view, for example:
+
+`karma.files` has set - `[setup.js, one.unit.js, two.unit.js]` - and it must be combined for each browser as `[setup.js, one.unit.js]` and `[setup.js, two.unit.js]`
 
 ## Installation
 

lib/framework.js

@@ -1,6 +1,5 @@
 const _ = require('lodash');
-
-const { isSpecFile } = require('./matchers');
+const { isSpecFile, splitArray } = require('./utils');
 
 function getConfig(fullConfig) {
   // ensure we can manipulate config settings
@@ -10,6 +9,7 @@ function getConfig(fullConfig) {
   config.base = config.base ? config.base : '/base';
   config.sets = [];
   config.indexMap = {};
+  config.getSets = config.getSets ? config.getSets : getSets;
   return config;
 }
 
@@ -27,23 +27,16 @@ function setupCoverageReporting(fullConfig) {
   fullConfig.coverageReporter.browserId = 'name';
 }
 
-// modified from example at:
-// https://stackoverflow.com/questions/8188548/splitting-a-js-array-into-n-arrays
-function splitArray(flatArray, numCols){
-  const maxColLength = Math.ceil(flatArray.length/numCols);
-  const nestedArray = _.chunk(flatArray, maxColLength);
-  for (var i = nestedArray.length; i < numCols; i++) {
-    nestedArray.push([]);
-  }
-  return nestedArray;
+function setupSets(config, basePath, files) {
+  config.sets = config.getSets(config, basePath, files);
+  config.performSharding = _.last(config.sets).length;
 }
 
-function setupSets(config, basePath, files) {
+// can be redefined in sharding config
+function getSets(config, basePath, files) {
   var specs = files.served.map(f => config.base + f.path.replace(basePath, ''))
     .filter(p => isSpecFile(p, config.specMatcher));
-  config.sets = splitArray(specs, config.browserCount);
-  var lastSet = config.sets && config.sets.length && config.sets[config.sets.length - 1];
-  config.performSharding = (lastSet && lastSet.length);
+  return splitArray(specs, config.browserCount);
 }
 
 function setupSharding(config, fullConfig, log) {

lib/middleware.js

@@ -1,4 +1,4 @@
-const { isSpecFile } = require('./matchers');
+const { isSpecFile } = require('./utils');
 
 const idParamExtractor = /\/\?id=(\d+)/;
 const idCookieExtractor = /browser.id=(\d+)/;

lib/utils.js

@@ -0,0 +1,22 @@
+const _ = require('lodash');
+
+// modified from example at:
+// https://stackoverflow.com/questions/8188548/splitting-a-js-array-into-n-arrays
+function splitArray(flatArray, numCols){
+  var maxColLength = Math.ceil(flatArray.length/numCols);
+  var nestedArray = _.chunk(flatArray, maxColLength);
+  for (var i = nestedArray.length; i < numCols; i++) {
+    nestedArray.push([]);
+  }
+  return nestedArray;
+}
+
+function isSpecFile(url, matcher) {
+  return (
+    url.indexOf('/bower_components/') === -1 &&
+    url.indexOf('/node_modules/') === -1 &&
+    matcher.test(url)
+  );
+}
+
+module.exports = { isSpecFile, splitArray };

package.json

@@ -31,6 +31,11 @@
       "name": "Ryan Schuft",
       "email": "[email protected]",
       "url": "https://github.com/rschuft"
+    },
+    {
+      "name": "Mikhail Zheludev",
+      "email": "[email protected]",
+      "url": "https://github.com/jbubsk"
     }
   ],
   "maintainers": [