From a96944f93b7f9e5079c7125e0c19d14a45beec3d Mon Sep 17 00:00:00 2001
From: Kris Penney <krisp@squareup.com>
Date: Tue, 1 Nov 2022 12:59:06 -0400
Subject: [PATCH] wip

---
 .../palette-exemplar/tests/upstreamableTestUtilities.tsx | 9 +++++++--
 .../tabs/palette-lts/tests/upstreamableTestUtilities.tsx | 7 ++++++-
 .../starter-basic/tests/upstreamableTestUtilities.tsx    | 7 ++++++-
 .../basic/tests/upstreamableTestUtilities.tsx            | 7 ++++++-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/examples/tabs/palette-exemplar/tests/upstreamableTestUtilities.tsx b/examples/tabs/palette-exemplar/tests/upstreamableTestUtilities.tsx
index a1b20b8849b..51eddf60782 100644
--- a/examples/tabs/palette-exemplar/tests/upstreamableTestUtilities.tsx
+++ b/examples/tabs/palette-exemplar/tests/upstreamableTestUtilities.tsx
@@ -2,8 +2,13 @@ import { createBrowserHistory } from "history"
 import React from "react"
 import { Provider } from "react-redux"
 import { render } from "@testing-library/react"
-import { createStore } from "redux"
+import {createStore} from "redux"
 import { rootReducer } from "src/ducks"
+import {createReduxHistoryContext} from "redux-first-history";
+
+const { routerReducer } = createReduxHistoryContext({
+        history: createBrowserHistory()
+    })
 
 // this is a handy function that I normally make available for all my tests
 // that deal with connected components.
@@ -25,7 +30,7 @@ export const renderWithRedux: (
   ui,
   {
     initialState,
-    store = createStore(rootReducer(createBrowserHistory()), initialState)
+    store = createStore(rootReducer(routerReducer), initialState)
   }: any = {}
 ) => {
   return {
diff --git a/examples/tabs/palette-lts/tests/upstreamableTestUtilities.tsx b/examples/tabs/palette-lts/tests/upstreamableTestUtilities.tsx
index a1b20b8849b..5b3acea81f5 100644
--- a/examples/tabs/palette-lts/tests/upstreamableTestUtilities.tsx
+++ b/examples/tabs/palette-lts/tests/upstreamableTestUtilities.tsx
@@ -4,6 +4,11 @@ import { Provider } from "react-redux"
 import { render } from "@testing-library/react"
 import { createStore } from "redux"
 import { rootReducer } from "src/ducks"
+import {createReduxHistoryContext} from "redux-first-history";
+
+const { routerReducer } = createReduxHistoryContext({
+    history: createBrowserHistory()
+})
 
 // this is a handy function that I normally make available for all my tests
 // that deal with connected components.
@@ -25,7 +30,7 @@ export const renderWithRedux: (
   ui,
   {
     initialState,
-    store = createStore(rootReducer(createBrowserHistory()), initialState)
+    store = createStore(rootReducer(routerReducer), initialState)
   }: any = {}
 ) => {
   return {
diff --git a/examples/tabs/starter-basic/tests/upstreamableTestUtilities.tsx b/examples/tabs/starter-basic/tests/upstreamableTestUtilities.tsx
index a1b20b8849b..5b3acea81f5 100644
--- a/examples/tabs/starter-basic/tests/upstreamableTestUtilities.tsx
+++ b/examples/tabs/starter-basic/tests/upstreamableTestUtilities.tsx
@@ -4,6 +4,11 @@ import { Provider } from "react-redux"
 import { render } from "@testing-library/react"
 import { createStore } from "redux"
 import { rootReducer } from "src/ducks"
+import {createReduxHistoryContext} from "redux-first-history";
+
+const { routerReducer } = createReduxHistoryContext({
+    history: createBrowserHistory()
+})
 
 // this is a handy function that I normally make available for all my tests
 // that deal with connected components.
@@ -25,7 +30,7 @@ export const renderWithRedux: (
   ui,
   {
     initialState,
-    store = createStore(rootReducer(createBrowserHistory()), initialState)
+    store = createStore(rootReducer(routerReducer), initialState)
   }: any = {}
 ) => {
   return {
diff --git a/packages/@misk/cli/plop-templates/basic/tests/upstreamableTestUtilities.tsx b/packages/@misk/cli/plop-templates/basic/tests/upstreamableTestUtilities.tsx
index a1b20b8849b..5b3acea81f5 100644
--- a/packages/@misk/cli/plop-templates/basic/tests/upstreamableTestUtilities.tsx
+++ b/packages/@misk/cli/plop-templates/basic/tests/upstreamableTestUtilities.tsx
@@ -4,6 +4,11 @@ import { Provider } from "react-redux"
 import { render } from "@testing-library/react"
 import { createStore } from "redux"
 import { rootReducer } from "src/ducks"
+import {createReduxHistoryContext} from "redux-first-history";
+
+const { routerReducer } = createReduxHistoryContext({
+    history: createBrowserHistory()
+})
 
 // this is a handy function that I normally make available for all my tests
 // that deal with connected components.
@@ -25,7 +30,7 @@ export const renderWithRedux: (
   ui,
   {
     initialState,
-    store = createStore(rootReducer(createBrowserHistory()), initialState)
+    store = createStore(rootReducer(routerReducer), initialState)
   }: any = {}
 ) => {
   return {