Fix tests

Author: Samuel Maier

index.d.ts

@@ -283,7 +283,7 @@ export interface StoreCreator {
   <S, A extends Action, Ext, StateExt>(
     reducer: Reducer<S, A>,
     preloadedState?: DeepPartial<S>,
-    enhancer?: StoreEnhancer<Ext>
+    enhancer?: StoreEnhancer<Ext>,
     options?: ReduxOptions,
   ): Store<S & StateExt, A> & Ext
 }

src/createStore.js

@@ -3,7 +3,7 @@ import $$observable from 'symbol-observable'
 import ActionTypes from './utils/actionTypes'
 import isPlainObject from './utils/isPlainObject'
 
-let defaultOptions = {rules: {}}
+let defaultOptions = { rules: {} }
 
 /**
  * Creates a Redux store that holds the state tree.
@@ -46,37 +46,28 @@ export default function createStore(reducer, preloadedState, enhancer, options)
   ) {
     throw new Error(
       'It looks like you are passing several store enhancers to ' +
-        'createStore(). This is not supported. Instead, compose them ' +
-        'together to a single function.'
+      'createStore(). This is not supported. Instead, compose them ' +
+      'together to a single function.'
     )
   }
 
   if (typeof preloadedState === 'function') {
-    if (
-      (typeof enhancer === 'object') ||
-      (typeof enhancer === 'undefined')
-    ) {
-      options = enhancer
-      enhancer = preloadedState
-      preloadedState = undefined
-    }
+    return createStore(reducer, undefined, preloadedState, enhancer)
   }
 
   if (typeof enhancer !== 'undefined') {
     if (typeof enhancer !== 'function') {
       throw new Error('Expected the enhancer to be a function.')
     }
 
-    return enhancer(createStore)(reducer, preloadedState)
+    return enhancer(createStore)(reducer, preloadedState, undefined, options)
   }
 
   if (typeof reducer !== 'function') {
     throw new Error('Expected the reducer to be a function.')
   }
-  
-  options = options || {};
-  
-  options = {...defaultOptions, ...options} // @todo find good supported option
+
+  options = { ...defaultOptions, ...options } // @todo find good supported option
 
   let banDispatch = !options.rules.allowDispatch
   let banGetState = !options.rules.allowGetState
@@ -110,8 +101,8 @@ export default function createStore(reducer, preloadedState, enhancer, options)
     if (banGetState && isDispatching) {
       throw new Error(
         'You may not call store.getState() while the reducer is executing. ' +
-          'The reducer has already received the state as an argument. ' +
-          'Pass it down from the top reducer instead of reading it from the store.'
+        'The reducer has already received the state as an argument. ' +
+        'Pass it down from the top reducer instead of reading it from the store.'
       )
     }
 
@@ -149,9 +140,9 @@ export default function createStore(reducer, preloadedState, enhancer, options)
     if (banSubscriptionHandling && isDispatching) {
       throw new Error(
         'You may not call store.subscribe() while the reducer is executing. ' +
-          'If you would like to be notified after the store has been updated, subscribe from a ' +
-          'component and invoke store.getState() in the callback to access the latest state. ' +
-          'See https://redux.js.org/api-reference/store#subscribe(listener) for more details.'
+        'If you would like to be notified after the store has been updated, subscribe from a ' +
+        'component and invoke store.getState() in the callback to access the latest state. ' +
+        'See https://redux.js.org/api-reference/store#subscribe(listener) for more details.'
       )
     }
 
@@ -168,7 +159,7 @@ export default function createStore(reducer, preloadedState, enhancer, options)
       if (banSubscriptionHandling && isDispatching) {
         throw new Error(
           'You may not unsubscribe from a store listener while the reducer is executing. ' +
-            'See https://redux.js.org/api-reference/store#subscribe(listener) for more details.'
+          'See https://redux.js.org/api-reference/store#subscribe(listener) for more details.'
         )
       }
 
@@ -209,14 +200,14 @@ export default function createStore(reducer, preloadedState, enhancer, options)
     if (!isPlainObject(action)) {
       throw new Error(
         'Actions must be plain objects. ' +
-          'Use custom middleware for async actions.'
+        'Use custom middleware for async actions.'
       )
     }
 
     if (typeof action.type === 'undefined') {
       throw new Error(
         'Actions may not have an undefined "type" property. ' +
-          'Have you misspelled a constant?'
+        'Have you misspelled a constant?'
       )
     }
 

test/createStore.spec.js

@@ -466,13 +466,14 @@ describe('createStore', () => {
   })
 
   it('does allow dispatch() from within a reducer if configured accordingly', () => {
+    console.log('-------------------NOW---------------------');
     const store = createStore(reducers.dispatchInTheMiddleOfReducer, identity, {rules: { allowDispatch: true } })
 
     expect(() =>
       store.dispatch(
         dispatchInMiddle(store.dispatch.bind(store, unknownAction()))
       )
-    ).not.toThrow(/may not dispatch/)
+    ).not.toThrow()
   })
 
   it('does not allow getState() from within a reducer', () => {
@@ -484,11 +485,12 @@ describe('createStore', () => {
   })
 
   it('does allow getState() from within a reducer if configured accordingly', () => {
+    console.log('-------------------NOW---------------------');
     const store = createStore(reducers.getStateInTheMiddleOfReducer, identity, {rules: { allowGetState: true } })
 
     expect(() =>
       store.dispatch(getStateInMiddle(store.getState.bind(store)))
-    ).not.toThrow(/You may not call store.getState()/)
+    ).not.toThrow()
   })
 
   it('does not allow subscribe() from within a reducer', () => {
@@ -500,11 +502,12 @@ describe('createStore', () => {
   })
 
   it('does allow subscribe() from within a reducer if configured accordingly', () => {
+    console.log('-------------------NOW---------------------');
     const store = createStore(reducers.subscribeInTheMiddleOfReducer, identity, {rules: { allowSubscriptionHandling: true } })
 
     expect(() =>
       store.dispatch(subscribeInMiddle(store.subscribe.bind(store, () => {})))
-    ).not.toThrow(/You may not call store.subscribe()/)
+    ).not.toThrow()
   })
 
   it('does not allow unsubscribe from subscribe() from within a reducer', () => {
@@ -522,7 +525,7 @@ describe('createStore', () => {
 
     expect(() =>
       store.dispatch(unsubscribeInMiddle(unsubscribe.bind(store)))
-    ).not.toThrow(/You may not unsubscribe from a store/)
+    ).not.toThrow()
   })
 
   it('recovers from an error within a reducer', () => {
@@ -559,7 +562,7 @@ describe('createStore', () => {
     const spyEnhancer = vanillaCreateStore => (...args) => {
       expect(args[0]).toBe(reducers.todos)
       expect(args[1]).toBe(emptyArray)
-      expect(args.length).toBe(2)
+      expect(args[2]).toBe(undefined)
       const vanillaStore = vanillaCreateStore(...args)
       return {
         ...vanillaStore,
@@ -583,7 +586,7 @@ describe('createStore', () => {
     const spyEnhancer = vanillaCreateStore => (...args) => {
       expect(args[0]).toBe(reducers.todos)
       expect(args[1]).toBe(undefined)
-      expect(args.length).toBe(2)
+      expect(args[2]).toBe(undefined)
       const vanillaStore = vanillaCreateStore(...args)
       return {
         ...vanillaStore,