merge-conflicts

[arvados-workbench2.git] / src / views / workbench / workbench.test.tsx

diff --git a/src/views/workbench/workbench.test.tsx b/src/views/workbench/workbench.test.tsx
index 6bd35b3449c42f6d86b89b367051bee3567674dd..6925792293b65c475539ddd9e0a9bf279cb02f9e 100644 (file)
--- a/src/views/workbench/workbench.test.tsx
+++ b/src/views/workbench/workbench.test.tsx
@@ -6,10 +6,21 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import Workbench from '../../views/workbench/workbench';
 import { Provider } from "react-redux";
-import store from "../../store/store";
+import configureStore from "../../store/store";
+import createBrowserHistory from "history/createBrowserHistory";
+import { ConnectedRouter } from "react-router-redux";
+
+const history = createBrowserHistory();
 
 it('renders without crashing', () => {
     const div = document.createElement('div');
-    ReactDOM.render(<Provider store={store}><Workbench/></Provider>, div);
+    const store = configureStore({ projects: [], router: { location: null }, auth: {}, sidePanel: [] }, createBrowserHistory());
+    ReactDOM.render(
+        <Provider store={store}>
+            <ConnectedRouter history={history}>
+                <Workbench/>
+            </ConnectedRouter>
+        </Provider>,
+    div);
     ReactDOM.unmountComponentAtNode(div);
 });