From: Janicki Artur <artur.janicki@contractors.roche.com>
Date: Tue, 10 Jul 2018 11:54:09 +0000 (+0200)
Subject: Merge branch 'master' into 13765-information-inside-details-panel
X-Git-Tag: 1.2.0~54^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/f05e6a9cece7e3b118134136ee81bd7477ad10a0?hp=-c

Merge branch 'master' into 13765-information-inside-details-panel

refs #13765

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
---

f05e6a9cece7e3b118134136ee81bd7477ad10a0
diff --combined src/views/workbench/workbench.test.tsx
index 4b52d0b9,71bc915c..79a98ad6
--- a/src/views/workbench/workbench.test.tsx
+++ b/src/views/workbench/workbench.test.tsx
@@@ -9,23 -9,14 +9,14 @@@ import { Provider } from "react-redux"
  import configureStore from "../../store/store";
  import createBrowserHistory from "history/createBrowserHistory";
  import { ConnectedRouter } from "react-router-redux";
 -import { MuiThemeProvider } from '@material-ui/core';
 +import { MuiThemeProvider } from '@material-ui/core/styles';
  import { CustomTheme } from '../../common/custom-theme';
  
  const history = createBrowserHistory();
  
  it('renders without crashing', () => {
      const div = document.createElement('div');
-     const store = configureStore({
-         projects: {
-             items: [],
-             currentItemId: ""
-         },
-         collections: [],
-         router: { location: null },
-         auth: {},
-         sidePanel: []
-     }, createBrowserHistory());
+     const store = configureStore(createBrowserHistory());
      ReactDOM.render(
          <MuiThemeProvider theme={CustomTheme}>
              <Provider store={store}>