From: Michal Klobukowski Date: Tue, 10 Jul 2018 10:46:47 +0000 (+0200) Subject: Apply temporary fix X-Git-Tag: 1.2.0~55^2 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/92a7124fa9784501e320f97a68f72aca0632732e Apply temporary fix Feature #13775 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx index be257e83..9d25d920 100644 --- a/src/views-components/details-panel/details-panel.tsx +++ b/src/views-components/details-panel/details-panel.tsx @@ -107,8 +107,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ color: theme.palette.grey["600"], margin: `${theme.spacing.unit}px 0`, '& .fa-cogs': { - fontSize: "24px", - color: theme.customs.colors.green700 + fontSize: "24px" } }, tabContainer: { diff --git a/src/views/workbench/workbench.test.tsx b/src/views/workbench/workbench.test.tsx index 6edebaf0..71bc915c 100644 --- a/src/views/workbench/workbench.test.tsx +++ b/src/views/workbench/workbench.test.tsx @@ -9,27 +9,22 @@ 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 { 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( - - - - - , + + + + + + + , div); ReactDOM.unmountComponentAtNode(div); });