[ARVADOS-WORKBENCH2] updated: abf519da836b635eac4cf1f728615472169ba032

Git user git at public.curoverse.com
Wed Jun 6 02:44:43 EDT 2018


Summary of changes:
 src/components/project-list/project-list.tsx             |  3 +--
 src/{models/project.ts => components/tree/tree.test.tsx} |  6 ------
 src/views/workbench/workbench.test.tsx                   | 11 ++++++++++-
 tsconfig.test.json                                       |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 copy src/{models/project.ts => components/tree/tree.test.tsx} (53%)

       via  abf519da836b635eac4cf1f728615472169ba032 (commit)
      from  4cdf454b772363d262eb7a391c3f37c55800d853 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit abf519da836b635eac4cf1f728615472169ba032
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Wed Jun 6 08:44:10 2018 +0200

    Fix tests passing
    
    Feature #13535
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>:

diff --git a/src/components/project-list/project-list.tsx b/src/components/project-list/project-list.tsx
index 3526da3..ec16a67 100644
--- a/src/components/project-list/project-list.tsx
+++ b/src/components/project-list/project-list.tsx
@@ -4,9 +4,8 @@
 
 import * as React from 'react';
 import { Theme } from "@material-ui/core";
-import { StyleRulesCallback, WithStyles } from "@material-ui/core/styles";
+import { StyleRulesCallback, WithStyles, withStyles } from "@material-ui/core/styles";
 import Paper from "@material-ui/core/Paper/Paper";
-import withStyles from "@material-ui/core/es/styles/withStyles";
 import Table from "@material-ui/core/Table/Table";
 import TableHead from "@material-ui/core/TableHead/TableHead";
 import TableRow from "@material-ui/core/TableRow/TableRow";
diff --git a/src/components/tree/tree.test.tsx b/src/components/tree/tree.test.tsx
new file mode 100644
index 0000000..6a5f410
--- /dev/null
+++ b/src/components/tree/tree.test.tsx
@@ -0,0 +1,3 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
diff --git a/src/views/workbench/workbench.test.tsx b/src/views/workbench/workbench.test.tsx
index f7128a7..b1657bc 100644
--- a/src/views/workbench/workbench.test.tsx
+++ b/src/views/workbench/workbench.test.tsx
@@ -8,10 +8,19 @@ import Workbench from '../../views/workbench/workbench';
 import { Provider } from "react-redux";
 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');
     const store = configureStore({ projects: [], router: { location: null } }, createBrowserHistory());
-    ReactDOM.render(<Provider store={store}><Workbench/></Provider>, div);
+    ReactDOM.render(
+        <Provider store={store}>
+            <ConnectedRouter history={history}>
+                <Workbench/>
+            </ConnectedRouter>
+        </Provider>,
+    div);
     ReactDOM.unmountComponentAtNode(div);
 });
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 65ffdd4..2c7b284 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -3,4 +3,4 @@
   "compilerOptions": {
     "module": "commonjs"
   }
-}
\ No newline at end of file
+}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list