Add middleware test. Reorg test suite.

Author: timdorr

package.json

@@ -19,7 +19,7 @@
     "build": "mkdir -p lib && babel ./src -d lib",
     "lint": "eslint examples src test",
     "test": "npm run lint && npm run test:node && npm run test:browser",
-    "test:node": "mocha --compilers js:babel-register --recursive ./test/node",
+    "test:node": "mocha --compilers js:babel-register --recursive ./test/*.spec.js",
     "test:browser": "karma start",
     "test:cov": "npm run test:cov:browser && npm run test:cov:node && npm run test:cov:report",
     "test:cov:node": "babel-node $(npm bin)/isparta cover $(npm bin)/_mocha report --dir ./coverage/node-coverage -- --recursive ./test/node",

src/middleware.js

@@ -1,4 +1,4 @@
-import UPDATE_LOCATION from './actions'
+import { UPDATE_LOCATION } from './actions'
 
 /**
  * This middleware captures UPDATE_LOCATION actions to redirect to the

test/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "env": {
+    "mocha": true
+  }
+}

test/createTests.js renamed to test/_createSyncTest.js

@@ -1,5 +1,3 @@
-/*eslint-env mocha */
-
 import expect from 'expect'
 
 import { createStore, combineReducers } from 'redux'

test/node/actions.js renamed to test/actions.spec.js

@@ -1,11 +1,9 @@
-/* eslint-env mocha */
-
 import expect from 'expect'
 
 import {
   UPDATE_LOCATION,
   push, replace, go, goBack, goForward
-} from '../../src/actions'
+} from '../src/actions'
 
 describe('routeActions', () => {
 

test/browser/index.js

@@ -1,7 +1,7 @@
 import 'babel-polyfill'
 
 import { hashHistory, browserHistory } from 'react-router'
-import createTests from '../createTests.js'
+import createTests from '../_createSyncTest'
 
 createTests(hashHistory, 'Hash History', () => window.location = '#/')
 createTests(browserHistory, 'Browser History', () => window.history.replaceState(null, null, '/'))

test/middleware.spec.js

@@ -0,0 +1,34 @@
+import expect, { createSpy } from 'expect'
+
+import { push, replace } from '../src/actions'
+import routerMiddleware from '../src/middleware'
+
+describe('routerMiddleware', () => {
+  let history, next, dispatch
+
+  beforeEach(() => {
+    history = {
+      push: createSpy(),
+      replace: createSpy()
+    }
+    next = createSpy()
+
+    dispatch = routerMiddleware(history)()(next)
+  })
+
+
+  it('calls the appropriate history method', () => {
+    dispatch(push('/foo'))
+    expect(history.push).toHaveBeenCalled()
+
+    dispatch(replace('/foo'))
+    expect(history.replace).toHaveBeenCalled()
+
+    expect(next).toNotHaveBeenCalled()
+  })
+
+  it('ignores other actions', () => {
+    dispatch({ type: 'FOO' })
+    expect(next).toHaveBeenCalled()
+  })
+})

test/node/reducer.js renamed to test/reducer.spec.js

@@ -1,8 +1,6 @@
-/* eslint-env mocha */
-
 import expect from 'expect'
 
-import { LOCATION_CHANGE, routerReducer } from '../../src/reducer'
+import { LOCATION_CHANGE, routerReducer } from '../src/reducer'
 
 describe('routerReducer', () => {
   const state = {

test/node/history.js renamed to test/sync.spec.js

@@ -1,4 +1,4 @@
 import { createMemoryHistory } from 'react-router'
-import createTests from '../createTests.js'
+import createTests from './_createSyncTest'
 
 createTests(createMemoryHistory(), 'Memory History')

tests.webpack.js

@@ -1,2 +1,2 @@
-const browserContext = require.context('./test/browser', true, /\.js$/);
-browserContext.keys().forEach(browserContext);
+const browserContext = require.context('./test/browser')
+browserContext.keys().forEach(browserContext)