Fix tests

Author: brentvatne

src/routers/StackRouter.js

@@ -435,7 +435,7 @@ export default (routeConfigs, stackConfig = {}) => {
           }
           const routes = [...state.routes];
           routes[routeIndex] = {
-            params: getParamsForRouteAndAction(action.routeName, action.params),
+            params: getParamsForRouteAndAction(action.routeName, action),
             // merge the child state in this order to allow params override
             ...childState,
             routeName: action.routeName,

src/routers/__tests__/StackRouter-test.js

@@ -1284,7 +1284,7 @@ describe('StackRouter', () => {
           screen: FooScreen,
         },
       },
-      { initialRouteName: 'Bar', initialRouteParams: { foo: 'bar' } }
+      { initialRouteName: 'Foo', initialRouteParams: { foo: 'bar' } }
     );
     const state = router.getStateForAction({ type: NavigationActions.INIT });
     expect(state).toEqual({
@@ -1294,13 +1294,39 @@ describe('StackRouter', () => {
       routes: [
         {
           key: state && state.routes[0].key,
-          routeName: 'Bar',
+          routeName: 'Foo',
           params: { foo: 'bar' },
         },
       ],
     });
   });
 
+  test('params in route config are merged with initialRouteParams', () => {
+    const FooScreen = () => <div />;
+    const router = StackRouter(
+      {
+        Foo: {
+          screen: FooScreen,
+          params: { foo: 'not-bar', meaning: 42 }
+        },
+      },
+      { initialRouteName: 'Foo', initialRouteParams: { foo: 'bar' } }
+    );
+    const state = router.getStateForAction({ type: NavigationActions.INIT });
+    expect(state).toEqual({
+      index: 0,
+      isTransitioning: false,
+      key: 'StackRouterRoot',
+      routes: [
+        {
+          key: state && state.routes[0].key,
+          routeName: 'Foo',
+          params: { foo: 'bar', meaning: 42 },
+        },
+      ],
+    });
+  });
+
   test('Action params appear in nav state', () => {
     const FooScreen = () => <div />;
     const BarScreen = () => <div />;