Merge branch 'master' into 13765-information-inside-details-panel
authorJanicki Artur <artur.janicki@contractors.roche.com>
Tue, 10 Jul 2018 11:54:09 +0000 (13:54 +0200)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Tue, 10 Jul 2018 11:54:09 +0000 (13:54 +0200)
refs #13765

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

1  2 
src/views/workbench/workbench.test.tsx

index 4b52d0b9ca757b63d1eb9d0f4186679f9860de57,71bc915c5ed155f26c677997f0ae6e2eb7f1ba96..79a98ad60b172191a509bff635b3079eb7fc1ddb
@@@ -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}>