Unsubscribe after each test to silence warnings

reactjs · Nov 30, 2015 · 6c02fd7 · 6c02fd7
1 parent 43b7d41
commit 6c02fd7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 454 deletions.
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "test:node": "mocha --compilers js:babel-core/register --recursive ./test/node",
     "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:cov:node": "babel-node $(npm bin)/isparta cover $(npm bin)/_mocha report --dir ./coverage/node-coverage -- --recursive ./test/node",
     "test:cov:browser": "COVERAGE=true karma start",
     "test:cov:report": "$(npm bin)/istanbul report --dir ./coverage --include **/*coverage.json html text",
     "prepublish": "npm run build"

diff --git a/test/createTests.js b/test/createTests.js
@@ -7,8 +7,8 @@ function createSyncedHistoryAndStore(createHistory) {
     routing: routeReducer
   }));
   const history = createHistory();
-  syncReduxAndRouter(history, store);
-  return { history, store };
+  const unsubscribe = syncReduxAndRouter(history, store);
+  return { history, store, unsubscribe };
 }
 
 const defaultReset = () => {};
@@ -115,39 +115,57 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
     });
 
     describe('syncReduxAndRouter', () => {
+      let history, store, unsubscribe;
+
+      beforeEach(() => {
+        let synced = createSyncedHistoryAndStore(createHistory);
+        history = synced.history;
+        store = synced.store;
+        unsubscribe = synced.unsubscribe;
+      });
+
+      afterEach(() => {
+        unsubscribe();
+      });
+
       it('syncs router -> redux', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         expect(store.getState().routing.path).toEqual('/');
 
         history.pushState(null, '/foo');
         expect(store.getState().routing.path).toEqual('/foo');
         expect(store.getState().routing.state).toBe(null);
+        expect(store.getState().routing.replace).toBe(false);
 
         history.pushState({ bar: 'baz' }, '/foo');
         expect(store.getState().routing.path).toEqual('/foo');
         expect(store.getState().routing.state).toEqual({ bar: 'baz' });
+        expect(store.getState().routing.replace).toBe(true);
 
         history.replaceState(null, '/bar');
         expect(store.getState().routing.path).toEqual('/bar');
         expect(store.getState().routing.state).toBe(null);
+        expect(store.getState().routing.replace).toBe(true);
 
         history.pushState(null, '/bar');
         expect(store.getState().routing.path).toEqual('/bar');
         expect(store.getState().routing.state).toBe(null);
+        expect(store.getState().routing.replace).toBe(true);
 
         history.pushState(null, '/bar?query=1');
         expect(store.getState().routing.path).toEqual('/bar?query=1');
+        expect(store.getState().routing.replace).toBe(false);
 
         history.replaceState({ bar: 'baz' }, '/bar?query=1');
         expect(store.getState().routing.path).toEqual('/bar?query=1');
         expect(store.getState().routing.state).toEqual({ bar: 'baz' });
+        expect(store.getState().routing.replace).toBe(true);
 
-        history.pushState(null, '/bar?query=1#hash=2');
+        history.pushState({ bar: 'baz' }, '/bar?query=1#hash=2');
         expect(store.getState().routing.path).toEqual('/bar?query=1#hash=2');
+        expect(store.getState().routing.replace).toBe(true);
       });
 
       it('syncs redux -> router', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         expect(store.getState().routing).toEqual({
           path: '/',
           changeId: 1,
@@ -205,7 +223,6 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       });
 
       it('updates the router even if path is the same', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         expect(store.getState().routing).toEqual({
           path: '/',
           changeId: 1,
@@ -239,7 +256,6 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       });
 
       it('does not update the router for other state changes', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         store.dispatch({
           type: 'RANDOM_ACTION',
           value: 5
@@ -254,7 +270,6 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       });
 
       it('only updates the router once when dispatching from `listenBefore`', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         expect(store.getState().routing).toEqual({
           path: '/',
           changeId: 1,
@@ -280,10 +295,9 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       });
 
       it('does not unnecessarily update the store', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         const updates = [];
 
-        const unsubscribe = store.subscribe(() => {
+        const unsubscribeFromStore = store.subscribe(() => {
           updates.push(store.getState())
         });
 
@@ -293,7 +307,7 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
         store.dispatch(replacePath('/bar'));
         store.dispatch(replacePath('/bar', { bar: 'foo' }));
 
-        unsubscribe();
+        unsubscribeFromStore();
 
         expect(updates.length).toBe(5);
         expect(updates).toEqual([
@@ -341,7 +355,6 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       });
 
       it('allows updating the route from within `listenBefore`', () => {
-        const { history, store } = createSyncedHistoryAndStore(createHistory);
         expect(store.getState().routing).toEqual({
           path: '/',
           changeId: 1,