Don't leave test side effects with history singltons.

reactjs · Feb 8, 2016 · 9b2dc36 · 9b2dc36
1 parent 0b7b322
commit 9b2dc36
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "eslint-config-rackt": "^1.1.1",
     "eslint-plugin-react": "^3.15.0",
     "expect": "^1.13.0",
+    "history": "^2.0.0",
     "isparta": "^4.0.0",
     "isparta-loader": "^2.0.0",
     "karma": "^0.13.3",
@@ -63,7 +64,6 @@
     "karma-webpack": "^1.7.0",
     "mocha": "^2.3.4",
     "react": "^0.14.3",
-    "react-router": "^2.0.0-rc5",
     "redux": "^3.0.4",
     "redux-devtools": "^3.0.0",
     "redux-devtools-dock-monitor": "^1.0.1",

diff --git a/test/_createSyncTest.js b/test/_createSyncTest.js
@@ -12,7 +12,7 @@ expect.extend({
     search = '',
     hash = '',
     state = null,
-    query = {},
+    query,
     action = 'PUSH'
   }) {
     const { locationBeforeTransitions } = this.actual.getState().routing
@@ -28,19 +28,19 @@ expect.extend({
 })
 
 
-function createSyncedHistoryAndStore(testHistory) {
+function createSyncedHistoryAndStore(originalHistory) {
 
   const store = createStore(combineReducers({
     routing: routerReducer
   }))
-  const history = syncHistoryWithStore(testHistory, store)
+  const history = syncHistoryWithStore(originalHistory, store)
 
   return { history, store }
 }
 
 const defaultReset = () => {}
 
-export default function createTests(testHistory, name, reset = defaultReset) {
+export default function createTests(createHistory, name, reset = defaultReset) {
   describe(name, () => {
 
     beforeEach(reset)
@@ -49,7 +49,7 @@ export default function createTests(testHistory, name, reset = defaultReset) {
       let history, store
 
       beforeEach(() => {
-        let synced = createSyncedHistoryAndStore(testHistory)
+        let synced = createSyncedHistoryAndStore(createHistory())
         history = synced.history
         store = synced.store
       })
@@ -58,7 +58,7 @@ export default function createTests(testHistory, name, reset = defaultReset) {
         history.unsubscribe()
       })
 
-      it('syncs router -> redux', () => {
+      it('syncs history -> redux', () => {
         expect(store).toContainLocation({
           pathname: '/',
           action: 'POP'
@@ -91,8 +91,7 @@ export default function createTests(testHistory, name, reset = defaultReset) {
         history.push('/bar?query=1')
         expect(store).toContainLocation({
           pathname: '/bar',
-          search: '?query=1',
-          query: { query: '1' }
+          search: '?query=1'
         })
 
         history.push('/bar#baz')
@@ -109,7 +108,6 @@ export default function createTests(testHistory, name, reset = defaultReset) {
         expect(store).toContainLocation({
           pathname: '/bar',
           search: '?query=1',
-          query: { query: '1' },
           state: { bar: 'baz' },
           action: 'REPLACE'
         })
@@ -123,7 +121,6 @@ export default function createTests(testHistory, name, reset = defaultReset) {
         expect(store).toContainLocation({
           pathname: '/bar',
           search: '?query=1',
-          query: { query: '1' },
           hash: '#hash=2',
           state: { bar: 'baz' },
           action: 'REPLACE'
@@ -163,11 +160,13 @@ export default function createTests(testHistory, name, reset = defaultReset) {
     })
 
     describe('Redux DevTools', () => {
-      let history, store, devToolsStore
+      let originalHistory, history, store, devToolsStore
 
       beforeEach(() => {
+        originalHistory = createHistory()
+
         // Set initial URL before syncing
-        testHistory.push('/foo')
+        originalHistory.push('/foo')
 
         store = createStore(
           combineReducers({
@@ -177,7 +176,7 @@ export default function createTests(testHistory, name, reset = defaultReset) {
         )
         devToolsStore = store.liftedStore
 
-        history = syncHistoryWithStore(testHistory, store)
+        history = syncHistoryWithStore(originalHistory, store)
       })
 
       afterEach(() => {

diff --git a/test/browser/index.js b/test/browser/index.js
@@ -1,7 +1,7 @@
 import 'babel-polyfill'
 
-import { hashHistory, browserHistory } from 'react-router'
+import { createHashHistory, createHistory } from 'history'
 import createTests from '../_createSyncTest'
 
-createTests(hashHistory, 'Hash History', () => window.location = '#/')
-createTests(browserHistory, 'Browser History', () => window.history.replaceState(null, null, '/'))
+createTests(createHashHistory, 'Hash History', () => window.location = '#/')
+createTests(createHistory, 'Browser History', () => window.history.replaceState(null, null, '/'))
diff --git a/test/sync.spec.js b/test/sync.spec.js
@@ -1,4 +1,4 @@
-import { createMemoryHistory } from 'react-router'
+import { createMemoryHistory } from 'history'
 import createTests from './_createSyncTest'
 
-createTests(createMemoryHistory(), 'Memory History')
+createTests(createMemoryHistory, 'Memory History')