fix inadvertent non-running of saga tests and integration tests in karma

also, fix state munging in reducer test, eliminate repeated code,
increase coverage

karma-common.conf.js

@@ -56,11 +56,11 @@ module.exports = function (config, extraoptions) {
 
     files: [
       '../../node_modules/babel-polyfill/dist/polyfill.js',
-      '../*.test.js'
+      '../**/*.test.js'
     ],
 
     preprocessors: {
-      '../*.test.js': ['webpack'],
+      '../**/*.test.js': ['webpack'],
     },
 
     webpack,

src/actions.js

@@ -69,9 +69,9 @@ export function addRoute(params) {
   }
 }
 
-export function batchRoutes(routes) {
+export function batch(routes, type) {
   return {
-    type: types.BATCH_ROUTES,
+    type,
     payload: {
       ids: routes.map(r => r.name),
       routes: routes.reduce(
@@ -89,6 +89,10 @@ export function batchRoutes(routes) {
   }
 }
 
+export function batchRoutes(routes) {
+  return batch(routes, types.BATCH_ROUTES)
+}
+
 export function removeRoute(name) {
   return {
     type: types.REMOVE_ROUTE,
@@ -97,23 +101,7 @@ export function removeRoute(name) {
 }
 
 export function batchRemoveRoutes(routes) {
-  return {
-    type: types.BATCH_REMOVE_ROUTES,
-    payload: {
-      ids: routes.map(r => r.name),
-      routes: routes.reduce(
-        (defs, r) => ({
-          ...defs,
-          [r.name]: {
-            parent: r.parent,
-            ...r,
-            params: {},
-            state: {}
-          }
-        }), {}
-      )
-    }
-  }
+  return batch(routes, types.BATCH_REMOVE_ROUTES)
 }
 
 export function setParamsAndState(details, params, state) {

test/index.test.js

@@ -221,4 +221,11 @@ describe('react-redux-saga-router', () => {
       }
     })
   })
+  it('setServer', () => {
+    expect(index.options.server).is.false
+    index.setServer()
+    expect(index.options.server).is.true
+    index.setServer(false)
+    expect(index.options.server).is.false
+  })
 })

test/reducer.test.js

@@ -3,7 +3,7 @@ import * as actions from '../src/actions'
 
 describe('react-redux-saga-router reducer', () => {
   it('ROUTE', () => {
-    const state = reducer()
+    const state = { ...reducer() }
     expect(reducer(state, actions.route({
       pathname: '',
       search: '',
@@ -23,14 +23,14 @@ describe('react-redux-saga-router reducer', () => {
     })
   })
   it('MATCH_ROUTES', () => {
-    const state = reducer()
+    const state = { ...reducer() }
     expect(reducer(state, actions.matchRoutes(['foo']))).eqls({
       ...state,
       matchedRoutes: ['foo']
     })
   })
   it('SET_PARAMS', () => {
-    const state = reducer()
+    const state = { ...reducer() }
     state.routes = {
       ids: ['foo', 'bar'],
       routes: {
@@ -78,7 +78,7 @@ describe('react-redux-saga-router reducer', () => {
     })
   })
   it('EDIT_ROUTE', () => {
-    const state = reducer()
+    const state = { ...reducer() }
     state.routes = {
       ids: ['foo', 'bar'],
       routes: {
@@ -124,7 +124,7 @@ describe('react-redux-saga-router reducer', () => {
     })
   })
   it('BATCH_ROUTE', () => {
-    const state = reducer()
+    const state = { ...reducer() }
     state.routes = {
       ids: ['foo', 'bar'],
       routes: {
@@ -190,12 +190,12 @@ describe('react-redux-saga-router reducer', () => {
     expect(reducer(state, action)).eqls(newstate)
   })
   it('REMOVE_ROUTE', () => {
-    const start = reducer()
+    const start = { ...reducer() }
     const state = reducer(start, actions.addRoute({ name: 'hi', path: '/hi/:there' }))
     expect(reducer(state, actions.removeRoute('hi'))).eqls(start)
   })
   it('BATCH_REMOVE_ROUTES', () => {
-    const fstate = reducer(undefined, actions.batchRoutes([
+    const fstate = { ...reducer(undefined, actions.batchRoutes([
       {
         name: 'fer',
         path: '/fer',
@@ -208,7 +208,7 @@ describe('react-redux-saga-router reducer', () => {
         params: {},
         state: {}
       }
-    ]))
+    ])) }
     expect(reducer(fstate, actions.batchRemoveRoutes([
       {
         name: 'fer',