Removed jest, jshint fixes

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))

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"

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');
 

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;

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',