Merge branch 'master' of https://github.com/RyanCCollins/scalable-react-boilerplate

Author: RyanCCollins

config/testing/karma.conf.js

@@ -6,10 +6,7 @@ module.exports = (config) => {
   config.set({
     frameworks: ['mocha'],
     reporters: ['coverage', 'mocha'],
-    browsers: process.env.TRAVIS // eslint-disable-line no-nested-ternary
-      ? ['ChromeTravis']
-      : process.env.APPVEYOR
-        ? ['IE'] : ['Chrome'],
+    browsers: ['Chrome'],
 
     autoWatch: false,
     singleRun: true,

config/testing/test-bundler.js

@@ -15,6 +15,6 @@ chai.use(chaiJsx);
 const context = require.context(
   '../../app/src',
   true,
-  /([^\a]+).test\.js$/
+  /([^]+).test\.js$/
 );
 context.keys().forEach(context);

package.json

@@ -101,12 +101,15 @@
     "chai": "^3.4.1",
     "chai-enzyme": "^0.5.0",
     "chai-immutable": "^1.5.3",
+    "chai-jsx": "^1.0.1",
     "cross-env": "^2.0.0",
     "enzyme": "^2.4.1",
     "eslint": "^1.10.3",
     "eslint-config-airbnb": "^4.0.0",
     "eslint-loader": "^1.1.1",
     "eslint-plugin-react": "^3.11.3",
+    "isparta": "^4.0.0",
+    "isparta-loader": "2.0.0",
     "jsdom": "^7.2.0",
     "karma": "1.1.1",
     "karma-chrome-launcher": "1.0.1",
@@ -119,12 +122,14 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.7.0",
     "mocha": "^2.3.4",
+    "null-loader": "0.1.1",
     "npm-install-webpack-plugin": "^4.0.3",
     "plop": "1.5.0",
     "react-css-modules": "^3.7.6",
     "react-hot-loader": "^1.3.0",
     "redux-devtools": "^3.0.1",
     "redux-mock-store": "^1.1.4",
+    "sinon": "2.0.0-pre",
     "webpack-dev-server": "^1.14.0",
     "webpack-visualizer-plugin": "^0.1.5"
   }