From b1ebbad5180a26e1ba73539129c9685ecebdef43 Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Tue, 12 May 2015 00:45:38 +0100
Subject: [PATCH 1/6] Initial attempt at replacing jest with mocha for testing.
 Refs #8

Sourcemaps aren't working correctly. Am thinking it might be easier to use karma...
---
 .../Footer/__tests__/Footer-test.js           |   6 +-
 app/run-tests.jsx                             |  10 ++
 app/stores/__tests__/BaseStore-test.js        |  62 ++++----
 dev-server.js                                 |   4 +-
 package.json                                  |  12 +-
 webpack.config.test.js                        | 136 ++++++++++++++++++
 6 files changed, 190 insertions(+), 40 deletions(-)
 create mode 100644 app/run-tests.jsx
 create mode 100644 webpack.config.test.js

diff --git a/app/components/Footer/__tests__/Footer-test.js b/app/components/Footer/__tests__/Footer-test.js
index 8d7e974..4583045 100644
--- a/app/components/Footer/__tests__/Footer-test.js
+++ b/app/components/Footer/__tests__/Footer-test.js
@@ -1,10 +1,8 @@
 'use strict';
 
 import React from 'react/addons';
-
-jest.dontMock('../Footer.jsx');
-
 import Footer from '../Footer.jsx';
+import { expect } from 'chai';
 
 let { TestUtils } = React.addons;
 
@@ -14,6 +12,6 @@ describe('Footer', () => {
       <Footer />
     );
     let footerElem = React.findDOMNode(footer);
-    expect(footerElem.className).toEqual('footer');
+    expect(footerElem.className).to.equal('footer');
   });
 });
diff --git a/app/run-tests.jsx b/app/run-tests.jsx
new file mode 100644
index 0000000..8da3b02
--- /dev/null
+++ b/app/run-tests.jsx
@@ -0,0 +1,10 @@
+'use strict';
+
+import './favicon.ico';
+import './index.html';
+import 'babel-core/polyfill';
+import 'normalize.css/normalize.css';
+import './scss/app.scss';
+
+import 'mocha!./components/Footer/__tests__/Footer-test.js';
+import 'mocha!./stores/__tests__/BaseStore-test.js';
diff --git a/app/stores/__tests__/BaseStore-test.js b/app/stores/__tests__/BaseStore-test.js
index befb59b..29032e1 100644
--- a/app/stores/__tests__/BaseStore-test.js
+++ b/app/stores/__tests__/BaseStore-test.js
@@ -1,10 +1,8 @@
 'use strict';
 
-jest.dontMock('babel-core/polyfill');
-jest.dontMock('../BaseStore.js');
-
 import 'babel-core/polyfill';
 import BaseStore from '../BaseStore.js';
+import { expect } from 'chai';
 
 const ITEMS_UPDATED = 'ITEMS_UPDATED';
 
@@ -25,14 +23,14 @@ describe('BaseStore', () => {
   it('Should set, get and remove data', function() {
 
     let store = new TestStore();
-    expect(store.getAll()).toEqual([]);
+    expect(store.getAll()).to.equal([]);
 
     let item = {
       foo: 'bar'
     };
 
     store.setAll([item]);
-    expect(store.getAll()).toEqual([item]);
+    expect(store.getAll()).to.equal([item]);
 
     let item2 = {
       foobaz: 'bar'
@@ -40,42 +38,42 @@ describe('BaseStore', () => {
 
     store.set(item2);
     store.set(item2); // intentional check for unique items
-    expect(store.getAll()).toEqual([item, item2]);
+    expect(store.getAll()).to.equal([item, item2]);
 
     store.remove(item);
-    expect(store.getAll()).toEqual([item2]);
+    expect(store.getAll()).to.equal([item2]);
   });
 
   it('Should call the change listener when data changes', () => {
 
-    let store = new TestStore();
-    let onChange = jest.genMockFunction();
-    store.addChangeListener(onChange);
-
-    store.setAll([{
-      foo: 'bar'
-    }]);
-    store.set([{
-      foobaz: 'bar'
-    }]);
-    store.remove({
-      foo: 'bar'
-    });
-    expect(onChange.mock.calls.length).toEqual(3);
+    // let store = new TestStore();
+    // let onChange = jest.genMockFunction();
+    // store.addChangeListener(onChange);
+
+    // store.setAll([{
+    //   foo: 'bar'
+    // }]);
+    // store.set([{
+    //   foobaz: 'bar'
+    // }]);
+    // store.remove({
+    //   foo: 'bar'
+    // });
+    // expect(onChange.mock.calls.length).to.equal(3);
   });
 
   it('Should remove the change listener', () => {
 
-    let store = new TestStore();
-    let onChange = jest.genMockFunction();
-    store.addChangeListener(onChange);
-    store.setAll([{
-      foo: 'bar'
-    }]);
-    store.removeChangeListener(onChange);
-    store.setAll([{
-      foo: 'bar'
-    }]);
-    expect(onChange.mock.calls.length).toEqual(1);
+    // let store = new TestStore();
+    // let onChange = jest.genMockFunction();
+    // store.addChangeListener(onChange);
+    // store.setAll([{
+    //   foo: 'bar'
+    // }]);
+    // store.removeChangeListener(onChange);
+    // store.setAll([{
+    //   foo: 'bar'
+    // }]);
+    // expect(onChange.mock.calls.length).to.equal(1);
   });
 });
diff --git a/dev-server.js b/dev-server.js
index 95f5db4..746e7ed 100644
--- a/dev-server.js
+++ b/dev-server.js
@@ -1,13 +1,15 @@
 var util = require('util');
 var webpack = require('webpack');
 var WebpackDevServer = require('webpack-dev-server');
-var config = require('./webpack.config');
 var opn = require('opn');
 var pkg = require('./package.json');
 
 var port = pkg.config.devPort;
 var host = pkg.config.devHost;
 
+var configPath = process.argv[2] || 'webpack.config.js';
+var config = require(configPath);
+
 var server = new WebpackDevServer(
   webpack(config),
   config.devServer
diff --git a/package.json b/package.json
index 3114cd7..8ffe15b 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "repository": "https://github.com/badsyntax/react-seed",
   "config": {
     "buildDir": "./build",
+    "buildDirTests": "./build_tests",
     "devPort": 8000,
     "devHost": "localhost"
   },
@@ -12,15 +13,15 @@
     "env": "env",
     "prerelease": "npm test",
     "prestart": "npm install",
-    "pretest": "npm install && npm run lint",
+    "pretest": "npm install",
     "prewebpack": "npm run clean",
     "clean": "rimraf $npm_package_config_buildDir && mkdir $npm_package_config_buildDir",
-    "start": "NODE_ENV=development node dev-server",
+    "start": "NODE_ENV=development node dev-server ./webpack.config.js",
     "webpack": "webpack --colors --progress --config ./webpack.config.js",
     "start-dev-server": "webpack-dev-server --output-pathinfo --inline",
     "build": "NODE_ENV=production npm run webpack",
     "lint": "eslint --ext .js --ext .jsx ./app && echo No linting errors.",
-    "test": "jest"
+    "test": "NODE_ENV=development node dev-server ./webpack.config.test.js"
   },
   "dependencies": {
     "classnames": "^1.2.0",
@@ -34,20 +35,25 @@
     "babel-jest": "^4.0.0",
     "babel-loader": "^5.0.0",
     "babel-runtime": "^5.1.11",
+    "chai": "^2.3.0",
     "css-loader": "^0.10.1",
     "eslint": "^0.19.0",
     "eslint-plugin-react": "^2.1.1",
     "extract-text-webpack-plugin": "^0.5.0",
     "file-loader": "^0.8.1",
+    "glob": "^5.0.5",
     "html-loader": "^0.2.3",
     "jest-cli": "^0.4.0",
     "json-loader": "^0.5.1",
     "lodash": "^3.7.0",
+    "mocha": "^2.2.4",
+    "mocha-loader": "^0.7.1",
     "opn": "^1.0.1",
     "postcss-loader": "^0.4.0",
     "react-hot-loader": "^1.2.5",
     "rimraf": "^2.3.2",
     "sass-loader": "^0.4.2",
+    "source-map-support": "^0.2.10",
     "style-loader": "^0.10.2",
     "template-html-loader": "0.0.3",
     "webpack": "^1.8.8",
diff --git a/webpack.config.test.js b/webpack.config.test.js
new file mode 100644
index 0000000..e2ae94a
--- /dev/null
+++ b/webpack.config.test.js
@@ -0,0 +1,136 @@
+var path = require('path');
+var util = require('util');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpack = require('webpack');
+var autoprefixer = require('autoprefixer-core');
+var pkg = require('./package.json');
+
+var DEBUG = process.env.NODE_ENV !== 'production';
+
+var cssBundle = path.join('css', util.format('[name].%s.css', pkg.version));
+var jsBundle = path.join('js', util.format('[name].%s.js', pkg.version));
+
+var entry = {
+  app: ['./run-tests.jsx']
+};
+
+entry.app.push(
+  util.format(
+    'webpack-dev-server/client?http://%s:%d',
+    pkg.config.devHost,
+    pkg.config.devPort
+  )
+);
+entry.app.push('webpack/hot/only-dev-server');
+
+var config = {
+  context: path.join(__dirname, 'app'),
+  cache: DEBUG,
+  debug: DEBUG,
+  target: 'web',
+  devtool: DEBUG ? 'inline-source-map' : false,
+  entry: entry,
+  output: {
+    path: path.resolve(pkg.config.buildDir),
+    publicPath: '/',
+    filename: jsBundle,
+    pathinfo: false
+  },
+  module: {
+    loaders: getLoaders()
+  },
+  postcss: [
+    autoprefixer
+  ],
+  plugins: getPlugins(),
+  resolve: {
+    extensions: ['', '.js', '.json', '.jsx']
+  },
+  devServer: {
+    contentBase: path.resolve(pkg.config.buildDir),
+    hot: true,
+    noInfo: false,
+    inline: true,
+    stats: { colors: true }
+  }
+};
+
+function getPlugins() {
+  var plugins = [
+    new webpack.optimize.OccurenceOrderPlugin()
+  ];
+  plugins.push(
+    new webpack.HotModuleReplacementPlugin()
+  );
+  return plugins;
+}
+
+function getLoaders() {
+
+  var jsxLoader;
+  var sassLoader;
+  var cssLoader;
+  var fileLoader = 'file-loader?name=[path][name].[ext]';
+  var htmlLoader = [
+    'file-loader?name=[path][name].[ext]',
+    'template-html-loader?' + [
+      'raw=true',
+      'engine=lodash',
+      'version=' + pkg.version,
+      'title=' + pkg.name,
+      'debug=' + DEBUG
+    ].join('&')
+  ].join('!');
+  var jsonLoader = ['json-loader'];
+
+  var sassParams = [
+    'outputStyle=expanded',
+    'includePaths[]=' + path.resolve(__dirname, './app/scss'),
+    'includePaths[]=' + path.resolve(__dirname, './node_modules')
+  ];
+
+    jsxLoader = ['react-hot', 'babel-loader?optional=runtime'];
+    sassParams.push('sourceMap', 'sourceMapContents=true')
+    sassLoader = [
+      'style-loader',
+      'css-loader?sourceMap',
+      'postcss-loader',
+      'sass-loader?' + sassParams.join('&')
+    ].join('!');
+    cssLoader = [
+      'style-loader',
+      'css-loader?sourceMap',
+      'postcss-loader'
+    ].join('!');
+
+  return [
+    {
+      test: /\.jsx?$/,
+      exclude: /node_modules/,
+      loaders: jsxLoader
+    },
+    {
+      test: /\.css$/,
+      loader: cssLoader
+    },
+    {
+      test: /\.jpe?g$|\.gif$|\.png$|\.ico|\.svg$|\.woff$|\.ttf$/,
+      loader: fileLoader
+    },
+    {
+      test: /\.json$/,
+      exclude: /node_modules/,
+      loaders: jsonLoader
+    },
+    {
+      test: /\.html$/,
+      loader: htmlLoader
+    },
+    {
+      test: /\.scss$/,
+      loader: sassLoader
+    }
+  ];
+}
+
+module.exports = config;

From 0e63523321b68064a969e3a3001c8768f81938db Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Thu, 14 May 2015 22:49:27 +0100
Subject: [PATCH 2/6] Karma, mocha & sinon with working sourcemaps! Refs #8

---
 .travis.yml                            |  2 +-
 app/app.tests.js                       |  6 +++
 app/run-tests.jsx                      | 10 ----
 app/stores/__tests__/BaseStore-test.js | 59 +++++++++++----------
 karma.conf.js                          | 27 ++++++++++
 package.json                           | 70 +++++++++++++-----------
 webpack.config.test.js                 | 73 +++++---------------------
 7 files changed, 118 insertions(+), 129 deletions(-)
 create mode 100644 app/app.tests.js
 delete mode 100644 app/run-tests.jsx
 create mode 100644 karma.conf.js

diff --git a/.travis.yml b/.travis.yml
index 15023fe..49ea609 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ language: node_js
 node_js:
   - "0.10"
 script:
-  - npm test
+  - npm run test-travis
diff --git a/app/app.tests.js b/app/app.tests.js
new file mode 100644
index 0000000..ca4a063
--- /dev/null
+++ b/app/app.tests.js
@@ -0,0 +1,6 @@
+'use strict';
+
+import 'babel-core/polyfill';
+
+let context = require.context('.', true, /-test\.js$/);
+context.keys().forEach(context);
diff --git a/app/run-tests.jsx b/app/run-tests.jsx
deleted file mode 100644
index 8da3b02..0000000
--- a/app/run-tests.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-import './favicon.ico';
-import './index.html';
-import 'babel-core/polyfill';
-import 'normalize.css/normalize.css';
-import './scss/app.scss';
-
-import 'mocha!./components/Footer/__tests__/Footer-test.js';
-import 'mocha!./stores/__tests__/BaseStore-test.js';
diff --git a/app/stores/__tests__/BaseStore-test.js b/app/stores/__tests__/BaseStore-test.js
index 29032e1..9069582 100644
--- a/app/stores/__tests__/BaseStore-test.js
+++ b/app/stores/__tests__/BaseStore-test.js
@@ -23,14 +23,15 @@ describe('BaseStore', () => {
   it('Should set, get and remove data', function() {
 
     let store = new TestStore();
-    expect(store.getAll()).to.equal([]);
+
+    expect(store.getAll()).to.eql([]);
 
     let item = {
       foo: 'bar'
     };
 
     store.setAll([item]);
-    expect(store.getAll()).to.equal([item]);
+    expect(store.getAll()).to.eql([item]);
 
     let item2 = {
       foobaz: 'bar'
@@ -38,42 +39,42 @@ describe('BaseStore', () => {
 
     store.set(item2);
     store.set(item2); // intentional check for unique items
-    expect(store.getAll()).to.equal([item, item2]);
+    expect(store.getAll()).to.eql([item, item2]);
 
     store.remove(item);
-    expect(store.getAll()).to.equal([item2]);
+    expect(store.getAll()).to.eql([item2]);
   });
 
   it('Should call the change listener when data changes', () => {
 
-    // let store = new TestStore();
-    // let onChange = jest.genMockFunction();
-    // store.addChangeListener(onChange);
-
-    // store.setAll([{
-    //   foo: 'bar'
-    // }]);
-    // store.set([{
-    //   foobaz: 'bar'
-    // }]);
-    // store.remove({
-    //   foo: 'bar'
-    // });
-    // expect(onChange.mock.calls.length).to.equal(3);
+    let store = new TestStore();
+    let onChange = sinon.spy();
+    store.addChangeListener(onChange);
+
+    store.setAll([{
+      foo: 'bar'
+    }]);
+    store.set([{
+      foobaz: 'bar'
+    }]);
+    store.remove({
+      foo: 'bar'
+    });
+    expect(onChange.callCount).to.equal(3);
   });
 
   it('Should remove the change listener', () => {
 
-    // let store = new TestStore();
-    // let onChange = jest.genMockFunction();
-    // store.addChangeListener(onChange);
-    // store.setAll([{
-    //   foo: 'bar'
-    // }]);
-    // store.removeChangeListener(onChange);
-    // store.setAll([{
-    //   foo: 'bar'
-    // }]);
-    // expect(onChange.mock.calls.length).to.equal(1);
+    let store = new TestStore();
+    let onChange = sinon.spy();
+    store.addChangeListener(onChange);
+    store.setAll([{
+      foo: 'bar'
+    }]);
+    store.removeChangeListener(onChange);
+    store.setAll([{
+      foo: 'bar'
+    }]);
+    expect(onChange.callCount).to.equal(1);
   });
 });
diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 0000000..7878c68
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,27 @@
+var webpackConfig = require('./webpack.config.test.js');
+
+module.exports = function(config) {
+  config.set({
+    basePath: '',
+    frameworks: ['source-map-support', 'mocha', 'sinon'],
+    files: [
+      'app/app.tests.js'
+    ],
+    exclude: [],
+    preprocessors: {
+      'app/app.tests.js': ['webpack', 'sourcemap'],
+    },
+    reporters: ['mocha'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: [/*'Chrome', */'PhantomJS'],
+    singleRun: false,
+    webpack: webpackConfig,
+    webpackMiddleware: {},
+    webpackServer: {
+      noInfo: true
+    }
+  });
+};
diff --git a/package.json b/package.json
index 8ffe15b..95a820a 100644
--- a/package.json
+++ b/package.json
@@ -6,57 +6,67 @@
   "config": {
     "buildDir": "./build",
     "buildDirTests": "./build_tests",
-    "devPort": 8000,
-    "devHost": "localhost"
+    "devHost": "localhost",
+    "devPort": 8000
   },
   "scripts": {
+    "build": "NODE_ENV=production npm run webpack",
+    "clean": "rimraf $npm_package_config_buildDir && mkdir $npm_package_config_buildDir",
     "env": "env",
-    "prerelease": "npm test",
+    "lint": "eslint --ext .js --ext .jsx ./app && echo No linting errors.",
+    "prebuild": "npm run clean",
     "prestart": "npm install",
     "pretest": "npm install",
-    "prewebpack": "npm run clean",
-    "clean": "rimraf $npm_package_config_buildDir && mkdir $npm_package_config_buildDir",
+    "pretest-travis": "npm install",
     "start": "NODE_ENV=development node dev-server ./webpack.config.js",
-    "webpack": "webpack --colors --progress --config ./webpack.config.js",
-    "start-dev-server": "webpack-dev-server --output-pathinfo --inline",
-    "build": "NODE_ENV=production npm run webpack",
-    "lint": "eslint --ext .js --ext .jsx ./app && echo No linting errors.",
-    "test": "NODE_ENV=development node dev-server ./webpack.config.test.js"
+    "test": "karma start",
+    "test-travis": "karma start --single-run",
+    "webpack": "webpack --colors --progress --config ./webpack.config.js"
   },
   "dependencies": {
-    "classnames": "^1.2.0",
-    "flux": "^2.0.1",
+    "classnames": "^2.1.1",
+    "flux": "^2.0.3",
     "normalize.css": "^3.0.3",
-    "react": "^0.13.2"
+    "react": "^0.13.3"
   },
   "devDependencies": {
     "autoprefixer-core": "^5.1.11",
-    "babel-core": "^5.1.11",
-    "babel-jest": "^4.0.0",
+    "babel-core": "^5.3.3",
+    "babel-jest": "^5.2.0",
     "babel-loader": "^5.0.0",
-    "babel-runtime": "^5.1.11",
+    "babel-runtime": "^5.3.3",
     "chai": "^2.3.0",
-    "css-loader": "^0.10.1",
-    "eslint": "^0.19.0",
-    "eslint-plugin-react": "^2.1.1",
-    "extract-text-webpack-plugin": "^0.5.0",
+    "css-loader": "^0.12.1",
+    "eslint": "^0.21.0",
+    "eslint-plugin-react": "^2.3.0",
+    "extract-text-webpack-plugin": "^0.8.0",
     "file-loader": "^0.8.1",
-    "glob": "^5.0.5",
-    "html-loader": "^0.2.3",
-    "jest-cli": "^0.4.0",
+    "glob": "^5.0.6",
+    "html-loader": "^0.3.0",
+    "jest-cli": "^0.4.3",
     "json-loader": "^0.5.1",
-    "lodash": "^3.7.0",
+    "karma": "^0.12.31",
+    "karma-chrome-launcher": "^0.1.12",
+    "karma-cli": "0.0.4",
+    "karma-mocha": "^0.1.10",
+    "karma-mocha-reporter": "^1.0.2",
+    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-sinon": "^1.0.4",
+    "karma-sourcemap-loader": "^0.3.4",
+    "karma-webpack": "^1.5.1",
+    "lodash": "^3.8.0",
     "mocha": "^2.2.4",
     "mocha-loader": "^0.7.1",
-    "opn": "^1.0.1",
-    "postcss-loader": "^0.4.0",
-    "react-hot-loader": "^1.2.5",
-    "rimraf": "^2.3.2",
+    "node-libs-browser": "^0.5.0",
+    "opn": "^1.0.2",
+    "postcss-loader": "^0.4.3",
+    "react-hot-loader": "^1.2.7",
+    "rimraf": "^2.3.3",
     "sass-loader": "^0.4.2",
     "source-map-support": "^0.2.10",
-    "style-loader": "^0.10.2",
+    "style-loader": "^0.12.2",
     "template-html-loader": "0.0.3",
-    "webpack": "^1.8.8",
+    "webpack": "^1.9.5",
     "webpack-dev-server": "^1.8.2"
   },
   "engines": {
diff --git a/webpack.config.test.js b/webpack.config.test.js
index e2ae94a..10a6afd 100644
--- a/webpack.config.test.js
+++ b/webpack.config.test.js
@@ -7,64 +7,19 @@ var pkg = require('./package.json');
 
 var DEBUG = process.env.NODE_ENV !== 'production';
 
-var cssBundle = path.join('css', util.format('[name].%s.css', pkg.version));
-var jsBundle = path.join('js', util.format('[name].%s.js', pkg.version));
-
-var entry = {
-  app: ['./run-tests.jsx']
-};
-
-entry.app.push(
-  util.format(
-    'webpack-dev-server/client?http://%s:%d',
-    pkg.config.devHost,
-    pkg.config.devPort
-  )
-);
-entry.app.push('webpack/hot/only-dev-server');
-
 var config = {
-  context: path.join(__dirname, 'app'),
-  cache: DEBUG,
-  debug: DEBUG,
-  target: 'web',
-  devtool: DEBUG ? 'inline-source-map' : false,
-  entry: entry,
-  output: {
-    path: path.resolve(pkg.config.buildDir),
-    publicPath: '/',
-    filename: jsBundle,
-    pathinfo: false
-  },
+  devtool: 'inline-source-map',
   module: {
     loaders: getLoaders()
   },
   postcss: [
     autoprefixer
   ],
-  plugins: getPlugins(),
   resolve: {
     extensions: ['', '.js', '.json', '.jsx']
-  },
-  devServer: {
-    contentBase: path.resolve(pkg.config.buildDir),
-    hot: true,
-    noInfo: false,
-    inline: true,
-    stats: { colors: true }
   }
 };
 
-function getPlugins() {
-  var plugins = [
-    new webpack.optimize.OccurenceOrderPlugin()
-  ];
-  plugins.push(
-    new webpack.HotModuleReplacementPlugin()
-  );
-  return plugins;
-}
-
 function getLoaders() {
 
   var jsxLoader;
@@ -89,19 +44,19 @@ function getLoaders() {
     'includePaths[]=' + path.resolve(__dirname, './node_modules')
   ];
 
-    jsxLoader = ['react-hot', 'babel-loader?optional=runtime'];
-    sassParams.push('sourceMap', 'sourceMapContents=true')
-    sassLoader = [
-      'style-loader',
-      'css-loader?sourceMap',
-      'postcss-loader',
-      'sass-loader?' + sassParams.join('&')
-    ].join('!');
-    cssLoader = [
-      'style-loader',
-      'css-loader?sourceMap',
-      'postcss-loader'
-    ].join('!');
+  jsxLoader = ['babel-loader?optional=runtime'];
+  sassParams.push('sourceMap', 'sourceMapContents=true')
+  sassLoader = [
+    'style-loader',
+    'css-loader?sourceMap',
+    'postcss-loader',
+    'sass-loader?' + sassParams.join('&')
+  ].join('!');
+  cssLoader = [
+    'style-loader',
+    'css-loader?sourceMap',
+    'postcss-loader'
+  ].join('!');
 
   return [
     {

From 1cdde0508231e41b6134f625f9acdf1075409948 Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Thu, 14 May 2015 22:55:55 +0100
Subject: [PATCH 3/6] Fixed travis tests, added missing package. Refs #8

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 95a820a..0161c27 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "karma-mocha-reporter": "^1.0.2",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-sinon": "^1.0.4",
+    "karma-source-map-support": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.4",
     "karma-webpack": "^1.5.1",
     "lodash": "^3.8.0",

From f9ec4217877d036235a22494a3bf4ceb6c0153ed Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Fri, 15 May 2015 00:08:49 +0100
Subject: [PATCH 4/6] Better webpack config. Refs #7

---
 README.md                                     |  10 +-
 app/app.tests.js                              |   2 +-
 .../{Footer-test.js => Footer-test.jsx}       |   0
 dev-server.js                                 |   3 +-
 karma.conf.js                                 |   7 +-
 package.json                                  |   8 +-
 webpack.config.js                             | 167 ------------------
 webpack.config.test.js                        |  91 ----------
 webpack/config.js                             |  62 +++++++
 webpack/config.test.js                        |   8 +
 webpack/loaders.js                            |  89 ++++++++++
 webpack/plugins.js                            |  35 ++++
 12 files changed, 206 insertions(+), 276 deletions(-)
 rename app/components/Footer/__tests__/{Footer-test.js => Footer-test.jsx} (100%)
 delete mode 100644 webpack.config.js
 delete mode 100644 webpack.config.test.js
 create mode 100644 webpack/config.js
 create mode 100644 webpack/config.test.js
 create mode 100644 webpack/loaders.js
 create mode 100644 webpack/plugins.js

diff --git a/README.md b/README.md
index 3567f42..50bd176 100644
--- a/README.md
+++ b/README.md
@@ -87,10 +87,6 @@ export default Menu;
 'use strict';
 
 import React from 'react/addons';
-
-jest.dontMock('../Menu.jsx');
-jest.dontMock('../../MenuItem/MenuItem.jsx');
-
 import Menu from '../Menu.jsx';
 
 let { TestUtils } = React.addons;
@@ -108,7 +104,7 @@ describe('Menu', () => {
   let menuElem = React.findDOMNode(menu);
 
   it('Renders the menu items', () => {
-    expect(menuElem.querySelectorAll('li').length).toEqual(2);
+    expect(menuElem.querySelectorAll('li').length).to.equal(2);
   });
 });
 ```
@@ -123,7 +119,7 @@ import 'normalize.css/normalize.css';
 import './scss/app.scss';
 ```
 
-* Sass include paths can be adjusted in the `webpack.config.js` file.
+* Sass include paths can be adjusted in the `webpack/loaders.js` file.
 * All CSS (compiled or otherwise) is run through Autoprefixer.
 * CSS files are combined in the order in which they are imported in JavaScript, thus
 you should always import your CSS/Sass before importing any other JavaScript files.
@@ -139,7 +135,7 @@ All required `.html` files are compiled with lodash.template and synced into the
 import './index.html';
 ```
 
-* You can adjust the lodash template data in the `webpack.config.js` file.
+* You can adjust the lodash template data in the `webpack/loaders.js` file.
 
 ## Conventions
 
diff --git a/app/app.tests.js b/app/app.tests.js
index ca4a063..c33cc73 100644
--- a/app/app.tests.js
+++ b/app/app.tests.js
@@ -2,5 +2,5 @@
 
 import 'babel-core/polyfill';
 
-let context = require.context('.', true, /-test\.js$/);
+let context = require.context('.', true, /-test\.jsx?$/);
 context.keys().forEach(context);
diff --git a/app/components/Footer/__tests__/Footer-test.js b/app/components/Footer/__tests__/Footer-test.jsx
similarity index 100%
rename from app/components/Footer/__tests__/Footer-test.js
rename to app/components/Footer/__tests__/Footer-test.jsx
diff --git a/dev-server.js b/dev-server.js
index 746e7ed..55fdf7b 100644
--- a/dev-server.js
+++ b/dev-server.js
@@ -7,7 +7,8 @@ var pkg = require('./package.json');
 var port = pkg.config.devPort;
 var host = pkg.config.devHost;
 
-var configPath = process.argv[2] || 'webpack.config.js';
+var configPath = process.argv[2] || './webpack/config';
+console.log('CONFIGPATH', configPath);
 var config = require(configPath);
 
 var server = new WebpackDevServer(
diff --git a/karma.conf.js b/karma.conf.js
index 7878c68..1d2d4cc 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,5 +1,3 @@
-var webpackConfig = require('./webpack.config.test.js');
-
 module.exports = function(config) {
   config.set({
     basePath: '',
@@ -18,9 +16,8 @@ module.exports = function(config) {
     autoWatch: true,
     browsers: [/*'Chrome', */'PhantomJS'],
     singleRun: false,
-    webpack: webpackConfig,
-    webpackMiddleware: {},
-    webpackServer: {
+    webpack: require('./webpack/config.test'),
+    webpackMiddleware: {
       noInfo: true
     }
   });
diff --git a/package.json b/package.json
index 0161c27..7a71c5e 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,10 @@
     "prestart": "npm install",
     "pretest": "npm install",
     "pretest-travis": "npm install",
-    "start": "NODE_ENV=development node dev-server ./webpack.config.js",
-    "test": "karma start",
-    "test-travis": "karma start --single-run",
-    "webpack": "webpack --colors --progress --config ./webpack.config.js"
+    "start": "NODE_ENV=development node dev-server ./webpack/config",
+    "test": "NODE_ENV=test karma start --config=test/webpack.config.js",
+    "test-travis": "NODE_ENV=test karma start --single-run",
+    "webpack": "webpack --colors --progress --config ./webpack/config"
   },
   "dependencies": {
     "classnames": "^2.1.1",
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 6f7178e..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,167 +0,0 @@
-var path = require('path');
-var util = require('util');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var webpack = require('webpack');
-var autoprefixer = require('autoprefixer-core');
-var pkg = require('./package.json');
-
-var DEBUG = process.env.NODE_ENV !== 'production';
-
-var cssBundle = path.join('css', util.format('[name].%s.css', pkg.version));
-var jsBundle = path.join('js', util.format('[name].%s.js', pkg.version));
-
-var entry = {
-  app: ['./app.jsx']
-};
-
-if (DEBUG) {
-  entry.app.push(
-    util.format(
-      'webpack-dev-server/client?http://%s:%d',
-      pkg.config.devHost,
-      pkg.config.devPort
-    )
-  );
-  entry.app.push('webpack/hot/only-dev-server');
-}
-
-var config = {
-  context: path.join(__dirname, 'app'),
-  cache: DEBUG,
-  debug: DEBUG,
-  target: 'web',
-  devtool: DEBUG ? 'inline-source-map' : false,
-  entry: entry,
-  output: {
-    path: path.resolve(pkg.config.buildDir),
-    publicPath: '/',
-    filename: jsBundle,
-    pathinfo: false
-  },
-  module: {
-    loaders: getLoaders()
-  },
-  postcss: [
-    autoprefixer
-  ],
-  plugins: getPlugins(),
-  resolve: {
-    extensions: ['', '.js', '.json', '.jsx']
-  },
-  devServer: {
-    contentBase: path.resolve(pkg.config.buildDir),
-    hot: true,
-    noInfo: false,
-    inline: true,
-    stats: { colors: true }
-  }
-};
-
-function getPlugins() {
-  var plugins = [
-    new webpack.optimize.OccurenceOrderPlugin()
-  ];
-  if (DEBUG) {
-    plugins.push(
-      new webpack.HotModuleReplacementPlugin()
-    );
-  } else {
-    plugins.push(
-      new ExtractTextPlugin(cssBundle, {
-        allChunks: true
-      }),
-      new webpack.optimize.UglifyJsPlugin(),
-      new webpack.optimize.DedupePlugin(),
-      new webpack.DefinePlugin({
-        'process.env': {
-          NODE_ENV: JSON.stringify('production')
-        }
-      }),
-      new webpack.NoErrorsPlugin()
-    );
-  }
-  return plugins;
-}
-
-function getLoaders() {
-
-  var jsxLoader;
-  var sassLoader;
-  var cssLoader;
-  var fileLoader = 'file-loader?name=[path][name].[ext]';
-  var htmlLoader = [
-    'file-loader?name=[path][name].[ext]',
-    'template-html-loader?' + [
-      'raw=true',
-      'engine=lodash',
-      'version=' + pkg.version,
-      'title=' + pkg.name,
-      'debug=' + DEBUG
-    ].join('&')
-  ].join('!');
-  var jsonLoader = ['json-loader'];
-
-  var sassParams = [
-    'outputStyle=expanded',
-    'includePaths[]=' + path.resolve(__dirname, './app/scss'),
-    'includePaths[]=' + path.resolve(__dirname, './node_modules')
-  ];
-
-  if (DEBUG) {
-    jsxLoader = ['react-hot', 'babel-loader?optional=runtime'];
-    sassParams.push('sourceMap', 'sourceMapContents=true')
-    sassLoader = [
-      'style-loader',
-      'css-loader?sourceMap',
-      'postcss-loader',
-      'sass-loader?' + sassParams.join('&')
-    ].join('!');
-    cssLoader = [
-      'style-loader',
-      'css-loader?sourceMap',
-      'postcss-loader'
-    ].join('!');
-  } else {
-    jsxLoader = ['babel-loader?optional=runtime'];
-    sassLoader = ExtractTextPlugin.extract('style-loader', [
-      'css-loader',
-      'postcss-loader',
-      'sass-loader?' + sassParams.join('&')
-    ].join('!'));
-    cssLoader = ExtractTextPlugin.extract('style-loader', [
-      'css-loader',
-      'postcss-loader'
-    ].join('!'));
-  }
-
-  return [
-    {
-      test: /\.jsx?$/,
-      exclude: /node_modules/,
-      loaders: jsxLoader
-    },
-    {
-      test: /\.css$/,
-      loader: cssLoader
-    },
-    {
-      test: /\.jpe?g$|\.gif$|\.png$|\.ico|\.svg$|\.woff$|\.ttf$/,
-      loader: fileLoader
-    },
-    {
-      test: /\.json$/,
-      exclude: /node_modules/,
-      loaders: jsonLoader
-    },
-    {
-      test: /\.html$/,
-      loader: htmlLoader
-    },
-    {
-      test: /\.scss$/,
-      loader: sassLoader
-    }
-  ];
-}
-
-module.exports = config;
diff --git a/webpack.config.test.js b/webpack.config.test.js
deleted file mode 100644
index 10a6afd..0000000
--- a/webpack.config.test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-var path = require('path');
-var util = require('util');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var webpack = require('webpack');
-var autoprefixer = require('autoprefixer-core');
-var pkg = require('./package.json');
-
-var DEBUG = process.env.NODE_ENV !== 'production';
-
-var config = {
-  devtool: 'inline-source-map',
-  module: {
-    loaders: getLoaders()
-  },
-  postcss: [
-    autoprefixer
-  ],
-  resolve: {
-    extensions: ['', '.js', '.json', '.jsx']
-  }
-};
-
-function getLoaders() {
-
-  var jsxLoader;
-  var sassLoader;
-  var cssLoader;
-  var fileLoader = 'file-loader?name=[path][name].[ext]';
-  var htmlLoader = [
-    'file-loader?name=[path][name].[ext]',
-    'template-html-loader?' + [
-      'raw=true',
-      'engine=lodash',
-      'version=' + pkg.version,
-      'title=' + pkg.name,
-      'debug=' + DEBUG
-    ].join('&')
-  ].join('!');
-  var jsonLoader = ['json-loader'];
-
-  var sassParams = [
-    'outputStyle=expanded',
-    'includePaths[]=' + path.resolve(__dirname, './app/scss'),
-    'includePaths[]=' + path.resolve(__dirname, './node_modules')
-  ];
-
-  jsxLoader = ['babel-loader?optional=runtime'];
-  sassParams.push('sourceMap', 'sourceMapContents=true')
-  sassLoader = [
-    'style-loader',
-    'css-loader?sourceMap',
-    'postcss-loader',
-    'sass-loader?' + sassParams.join('&')
-  ].join('!');
-  cssLoader = [
-    'style-loader',
-    'css-loader?sourceMap',
-    'postcss-loader'
-  ].join('!');
-
-  return [
-    {
-      test: /\.jsx?$/,
-      exclude: /node_modules/,
-      loaders: jsxLoader
-    },
-    {
-      test: /\.css$/,
-      loader: cssLoader
-    },
-    {
-      test: /\.jpe?g$|\.gif$|\.png$|\.ico|\.svg$|\.woff$|\.ttf$/,
-      loader: fileLoader
-    },
-    {
-      test: /\.json$/,
-      exclude: /node_modules/,
-      loaders: jsonLoader
-    },
-    {
-      test: /\.html$/,
-      loader: htmlLoader
-    },
-    {
-      test: /\.scss$/,
-      loader: sassLoader
-    }
-  ];
-}
-
-module.exports = config;
diff --git a/webpack/config.js b/webpack/config.js
new file mode 100644
index 0000000..859ce93
--- /dev/null
+++ b/webpack/config.js
@@ -0,0 +1,62 @@
+var path = require('path');
+var util = require('util');
+var webpack = require('webpack');
+var autoprefixer = require('autoprefixer-core');
+var pkg = require('../package.json');
+
+var loaders = require('./loaders');
+var plugins = require('./plugins');
+
+var DEBUG = process.env.NODE_ENV === 'development';
+var TEST = process.env.NODE_ENV === 'test';
+
+var jsBundle = path.join('js', util.format('[name].%s.js', pkg.version));
+
+var entry = {
+  app: ['./app.jsx']
+};
+
+if (DEBUG) {
+  entry.app.push(
+    util.format(
+      'webpack-dev-server/client?http://%s:%d',
+      pkg.config.devHost,
+      pkg.config.devPort
+    )
+  );
+  entry.app.push('webpack/hot/dev-server');
+}
+
+var config = {
+  context: path.join(__dirname, '../app'),
+  cache: DEBUG,
+  debug: DEBUG,
+  target: 'web',
+  devtool: DEBUG || TEST ? 'inline-source-map' : false,
+  entry: entry,
+  output: {
+    path: path.resolve(pkg.config.buildDir),
+    publicPath: '/',
+    filename: jsBundle,
+    pathinfo: false
+  },
+  module: {
+    loaders: loaders
+  },
+  postcss: [
+    autoprefixer
+  ],
+  plugins: plugins,
+  resolve: {
+    extensions: ['', '.js', '.json', '.jsx']
+  },
+  devServer: {
+    contentBase: path.resolve(pkg.config.buildDir),
+    hot: true,
+    noInfo: false,
+    inline: true,
+    stats: { colors: true }
+  }
+};
+
+module.exports = config;
diff --git a/webpack/config.test.js b/webpack/config.test.js
new file mode 100644
index 0000000..9d5f339
--- /dev/null
+++ b/webpack/config.test.js
@@ -0,0 +1,8 @@
+var config = require('./config');
+
+delete config['context'];
+delete config['entry'];
+delete config['output'];
+delete config['devServer'];
+
+module.exports = config;
diff --git a/webpack/loaders.js b/webpack/loaders.js
new file mode 100644
index 0000000..d9760eb
--- /dev/null
+++ b/webpack/loaders.js
@@ -0,0 +1,89 @@
+var path = require('path');
+var pkg = require('../package.json');
+
+var DEBUG = process.env.NODE_ENV === 'development';
+var TEST = process.env.NODE_ENV === 'test';
+
+var jsxLoader;
+var sassLoader;
+var cssLoader;
+var fileLoader = 'file-loader?name=[path][name].[ext]';
+var htmlLoader = [
+  'file-loader?name=[path][name].[ext]',
+  'template-html-loader?' + [
+    'raw=true',
+    'engine=lodash',
+    'version=' + pkg.version,
+    'title=' + pkg.name,
+    'debug=' + DEBUG
+  ].join('&')
+].join('!');
+var jsonLoader = ['json-loader'];
+
+var sassParams = [
+  'outputStyle=expanded',
+  'includePaths[]=' + path.resolve(__dirname, '../app/scss'),
+  'includePaths[]=' + path.resolve(__dirname, '../node_modules')
+];
+
+if (DEBUG || TEST) {
+  jsxLoader = [];
+  if (!TEST) {
+    jsxLoader.push('react-hot');
+  }
+  jsxLoader.push('babel-loader?optional=runtime');
+  sassParams.push('sourceMap', 'sourceMapContents=true')
+  sassLoader = [
+    'style-loader',
+    'css-loader?sourceMap',
+    'postcss-loader',
+    'sass-loader?' + sassParams.join('&')
+  ].join('!');
+  cssLoader = [
+    'style-loader',
+    'css-loader?sourceMap',
+    'postcss-loader'
+  ].join('!');
+} else {
+  jsxLoader = ['babel-loader?optional=runtime'];
+  sassLoader = ExtractTextPlugin.extract('style-loader', [
+    'css-loader',
+    'postcss-loader',
+    'sass-loader?' + sassParams.join('&')
+  ].join('!'));
+  cssLoader = ExtractTextPlugin.extract('style-loader', [
+    'css-loader',
+    'postcss-loader'
+  ].join('!'));
+}
+
+var loaders = [
+  {
+    test: /\.jsx?$/,
+    exclude: /node_modules/,
+    loaders: jsxLoader
+  },
+  {
+    test: /\.css$/,
+    loader: cssLoader
+  },
+  {
+    test: /\.jpe?g$|\.gif$|\.png$|\.ico|\.svg$|\.woff$|\.ttf$/,
+    loader: fileLoader
+  },
+  {
+    test: /\.json$/,
+    exclude: /node_modules/,
+    loaders: jsonLoader
+  },
+  {
+    test: /\.html$/,
+    loader: htmlLoader
+  },
+  {
+    test: /\.scss$/,
+    loader: sassLoader
+  }
+];
+
+module.exports = loaders;
diff --git a/webpack/plugins.js b/webpack/plugins.js
new file mode 100644
index 0000000..1df9b3e
--- /dev/null
+++ b/webpack/plugins.js
@@ -0,0 +1,35 @@
+var path = require('path');
+var util = require('util');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpack = require('webpack');
+var pkg = require('../package.json');
+
+var DEBUG = process.env.NODE_ENV === 'development';
+var TEST = process.env.NODE_ENV === 'test';
+
+var cssBundle = path.join('css', util.format('[name].%s.css', pkg.version));
+
+var plugins = [
+  new webpack.optimize.OccurenceOrderPlugin()
+];
+if (DEBUG) {
+  plugins.push(
+    new webpack.HotModuleReplacementPlugin()
+  );
+} else if (!TEST) {
+  plugins.push(
+    new ExtractTextPlugin(cssBundle, {
+      allChunks: true
+    }),
+    new webpack.optimize.UglifyJsPlugin(),
+    new webpack.optimize.DedupePlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify('production')
+      }
+    }),
+    new webpack.NoErrorsPlugin()
+  );
+}
+
+module.exports = plugins;

From 8f92f6d9c47d79b881d2ef6307d571567409ee1b Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Fri, 15 May 2015 00:12:06 +0100
Subject: [PATCH 5/6] Updated package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7a71c5e..15e2147 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "pretest": "npm install",
     "pretest-travis": "npm install",
     "start": "NODE_ENV=development node dev-server ./webpack/config",
-    "test": "NODE_ENV=test karma start --config=test/webpack.config.js",
+    "test": "NODE_ENV=test karma start",
     "test-travis": "NODE_ENV=test karma start --single-run",
     "webpack": "webpack --colors --progress --config ./webpack/config"
   },

From fdab7a1daa6118f4d315deeaedf639761934715a Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Fri, 15 May 2015 00:21:23 +0100
Subject: [PATCH 6/6] Removed jest, jshint fixes

---
 README.md              |  4 ++--
 package.json           | 28 ++++------------------------
 webpack/config.js      |  1 -
 webpack/config.test.js |  8 ++++----
 webpack/loaders.js     |  3 ++-
 5 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 50bd176..2de5b7a 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ A boilerplate for building React apps with ES6 and webpack.
 
 * React 0.13
 * Compilation of ES6 & JSX to ES5
-* Jest testing framework
-* webpack bundling with react hot loader (as well as html, css & sass loaders)
+* webpack module loader with react hot loader (as well as html, css & sass loaders)
+* Karma, mocha, chai & sinon for testing
 * Basic flux architecture with app actions, stores and example web API usage
 * React router ([feature/react-router](https://github.com/badsyntax/react-seed/tree/feature/react-router))
 * Material UI ([feature/material-ui](https://github.com/badsyntax/react-seed/tree/feature/material-ui))
diff --git a/package.json b/package.json
index 15e2147..27f44cf 100644
--- a/package.json
+++ b/package.json
@@ -13,11 +13,11 @@
     "build": "NODE_ENV=production npm run webpack",
     "clean": "rimraf $npm_package_config_buildDir && mkdir $npm_package_config_buildDir",
     "env": "env",
-    "lint": "eslint --ext .js --ext .jsx ./app && echo No linting errors.",
+    "lint": "eslint --ext .js --ext .jsx ./app ./webpack && echo No linting errors.",
     "prebuild": "npm run clean",
     "prestart": "npm install",
-    "pretest": "npm install",
-    "pretest-travis": "npm install",
+    "pretest": "npm install && npm run lint",
+    "pretest-travis": "npm install && npm run lint",
     "start": "NODE_ENV=development node dev-server ./webpack/config",
     "test": "NODE_ENV=test karma start",
     "test-travis": "NODE_ENV=test karma start --single-run",
@@ -32,7 +32,6 @@
   "devDependencies": {
     "autoprefixer-core": "^5.1.11",
     "babel-core": "^5.3.3",
-    "babel-jest": "^5.2.0",
     "babel-loader": "^5.0.0",
     "babel-runtime": "^5.3.3",
     "chai": "^2.3.0",
@@ -43,7 +42,6 @@
     "file-loader": "^0.8.1",
     "glob": "^5.0.6",
     "html-loader": "^0.3.0",
-    "jest-cli": "^0.4.3",
     "json-loader": "^0.5.1",
     "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.12",
@@ -73,23 +71,6 @@
   "engines": {
     "node": ">=0.10.0"
   },
-  "jest": {
-    "scriptPreprocessor": "./jest-preprocessor.js",
-    "testPathDirs": [
-      "./app"
-    ],
-    "testFileExtensions": [
-      "js"
-    ],
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "jsx"
-    ],
-    "unmockedModulePathPatterns": [
-      "<rootDir>/node_modules/react"
-    ]
-  },
   "eslintConfig": {
     "env": {
       "browser": true,
@@ -101,10 +82,9 @@
       "jsx": true
     },
     "globals": {
-      "jest": true,
       "describe": true,
       "it": true,
-      "expect": true
+      "sinon": true
     },
     "plugins": [
       "react"
diff --git a/webpack/config.js b/webpack/config.js
index 859ce93..ebda29b 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -1,6 +1,5 @@
 var path = require('path');
 var util = require('util');
-var webpack = require('webpack');
 var autoprefixer = require('autoprefixer-core');
 var pkg = require('../package.json');
 
diff --git a/webpack/config.test.js b/webpack/config.test.js
index 9d5f339..a4e49fb 100644
--- a/webpack/config.test.js
+++ b/webpack/config.test.js
@@ -1,8 +1,8 @@
 var config = require('./config');
 
-delete config['context'];
-delete config['entry'];
-delete config['output'];
-delete config['devServer'];
+delete config.context;
+delete config.entry;
+delete config.output;
+delete config.devServer;
 
 module.exports = config;
diff --git a/webpack/loaders.js b/webpack/loaders.js
index d9760eb..33da990 100644
--- a/webpack/loaders.js
+++ b/webpack/loaders.js
@@ -1,5 +1,6 @@
 var path = require('path');
 var pkg = require('../package.json');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 var DEBUG = process.env.NODE_ENV === 'development';
 var TEST = process.env.NODE_ENV === 'test';
@@ -32,7 +33,7 @@ if (DEBUG || TEST) {
     jsxLoader.push('react-hot');
   }
   jsxLoader.push('babel-loader?optional=runtime');
-  sassParams.push('sourceMap', 'sourceMapContents=true')
+  sassParams.push('sourceMap', 'sourceMapContents=true');
   sassLoader = [
     'style-loader',
     'css-loader?sourceMap',