Fix my mistakes in test setup (#3637)

* Fix my mistakes in test setup

* Update dependencies

Author: taion

.travis.yml

@@ -6,9 +6,9 @@ cache:
   directories:
   - node_modules
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 after_success:
 - cat ./coverage/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js
 - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

karma.conf.js

@@ -1,12 +1,11 @@
-/*eslint no-console: 0*/
-var webpack = require('webpack')
-var path = require('path')
+const webpack = require('webpack')
+const path = require('path')
 
-module.exports = function (config) {
+module.exports = config => {
   if (process.env.RELEASE)
     config.singleRun = true
 
-  var customLaunchers = {
+  const customLaunchers = {
     // Browsers to run on BrowserStack.
     BS_Chrome: {
       base: 'BrowserStack',
@@ -29,14 +28,14 @@ module.exports = function (config) {
       browser: 'safari',
       browser_version: '9.0'
     },
-    BS_MobileSafari: {
+    BS_MobileSafari8: {
       base: 'BrowserStack',
       os: 'ios',
       os_version: '8.3',
       browser: 'iphone',
       real_mobile: false
     },
-    BS_MobileSafari: {
+    BS_MobileSafari9: {
       base: 'BrowserStack',
       os: 'ios',
       os_version: '9.1',
@@ -65,29 +64,12 @@ module.exports = function (config) {
     }
   }
 
-  var isCi = process.env.CONTINUOUS_INTEGRATION === 'true'
-  var runCoverage = process.env.COVERAGE === 'true' || isCi
-
-  var coverageLoaders = []
-  var coverageReporters = []
-
-  if (runCoverage) {
-    coverageLoaders.push({
-      test: /\.js$/,
-      include: path.resolve('modules/'),
-      exclude: /__tests__/,
-      loader: 'isparta'
-    })
-
-    coverageReporters.push('coverage')
-  }
-
   config.set({
     customLaunchers: customLaunchers,
 
     browsers: [ 'Chrome' ],
     frameworks: [ 'mocha' ],
-    reporters: [ 'mocha' ].concat(coverageReporters),
+    reporters: [ 'mocha', 'coverage' ],
 
     files: [
       'tests.webpack.js'
@@ -98,11 +80,17 @@ module.exports = function (config) {
     },
 
     webpack: {
-      devtool: 'inline-source-map',
+      devtool: 'cheap-module-inline-source-map',
       module: {
         loaders: [
-          { test: /\.js$/, exclude: /node_modules/, loader: 'babel' }
-        ].concat(coverageLoaders)
+          { test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
+          {
+            test: /\.js$/,
+            include: path.resolve('modules/'),
+            exclude: /__tests__/,
+            loader: 'isparta'
+          }
+        ]
       },
       plugins: [
         new webpack.DefinePlugin({
@@ -132,7 +120,7 @@ module.exports = function (config) {
     config.captureTimeout = 120000
 
     if (process.env.TRAVIS) {
-      var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
+      const buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
 
       config.browserStack = {
         username: process.env.BROWSER_STACK_USERNAME,

package.json

@@ -20,7 +20,7 @@
     "build-es": "rimraf es6 && cross-env BABEL_ENV=es babel ./modules -d es6 --ignore '__tests__'",
     "build-umd": "cross-env BABEL_ENV=cjs NODE_ENV=development webpack modules/index.js umd/ReactRouter.js",
     "build-min": "cross-env BABEL_ENV=cjs NODE_ENV=production webpack -p modules/index.js umd/ReactRouter.min.js",
-    "lint": "eslint modules examples",
+    "lint": "eslint modules examples *.js",
     "start": "cross-env BABEL_ENV=cjs node examples/server.js",
     "test": "npm run lint && npm run test-node && npm run test-browser",
     "test-browser": "cross-env BABEL_ENV=cjs karma start",
@@ -44,7 +44,7 @@
   "devDependencies": {
     "babel-cli": "^6.10.1",
     "babel-core": "^6.10.4",
-    "babel-eslint": "^6.1.0",
+    "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.4",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
@@ -56,33 +56,33 @@
     "babel-register": "^6.9.0",
     "bundle-loader": "^0.5.4",
     "codecov.io": "^0.1.6",
-    "coveralls": "^2.11.9",
-    "cross-env": "^1.0.8",
+    "coveralls": "^2.11.11",
+    "cross-env": "^2.0.0",
     "css-loader": "^0.23.1",
-    "eslint": "^3.0.0",
+    "eslint": "^3.0.1",
     "eslint-config-rackt": "^1.1.1",
     "eslint-plugin-react": "^5.2.2",
     "expect": "^1.20.2",
     "express": "^4.14.0",
     "express-urlrewrite": "^1.2.0",
     "gzip-size": "^3.0.0",
     "isparta-loader": "^2.0.0",
-    "karma": "^1.1.0",
+    "karma": "^1.1.1",
     "karma-browserstack-launcher": "^1.0.1",
     "karma-chrome-launcher": "^1.0.1",
-    "karma-coverage": "^1.0.0",
+    "karma-coverage": "^1.1.0",
     "karma-mocha": "^1.1.1",
     "karma-mocha-reporter": "^2.0.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
     "mocha": "^2.5.3",
     "pretty-bytes": "^3.0.1",
     "qs": "^6.2.0",
-    "react": "^15.2.0",
-    "react-addons-css-transition-group": "^15.2.0",
-    "react-addons-test-utils": "^15.2.0",
-    "react-dom": "^15.2.0",
-    "rimraf": "^2.5.2",
+    "react": "^15.2.1",
+    "react-addons-css-transition-group": "^15.2.1",
+    "react-addons-test-utils": "^15.2.1",
+    "react-dom": "^15.2.1",
+    "rimraf": "^2.5.3",
     "style-loader": "^0.13.1",
     "webpack": "^1.13.1",
     "webpack-dev-middleware": "^1.6.1"

tests.webpack.js

@@ -1,5 +1,5 @@
-/* eslint-disable no-console */
 /* eslint-env mocha */
+/* eslint-disable no-console */
 
 import expect from 'expect'
 

webpack.config.js

@@ -1,4 +1,4 @@
-var webpack = require('webpack')
+const webpack = require('webpack')
 
 module.exports = {