Merge branch 'gchqgh-7-ui-develop' of https://github.com/jpelbertrios…

…/Kai into gchqgh-7-ui-develop
macenturalxl1 · Sep 8, 2020 · 61e98ee · 61e98ee
2 parents 6e727b7 + 6c30484
commit 61e98ee
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9,243 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -8,8 +8,7 @@
     "client": "react-scripts start",
     "server": "node server/middleware.js",
     "build": "react-scripts build",
-    "test": "jest",
-    "test-cov": "jest \"--coverage\"",
+    "test": "jest \"--coverage\"",
     "deploy": "aws s3 sync build/ s3://kai-ui",
     "eject": "react-scripts eject"
   },

diff --git a/ui/src/components/AddGraph/AddGraph.tsx b/ui/src/components/AddGraph/AddGraph.tsx
@@ -101,16 +101,8 @@ export default class AddGraph extends React.Component<{}, IState> {
         }
     }
 
-    private async setFiles(files: Array<File>) {
-        this.setState({
-            files: files
-        });
-    }
-
     private async getSchema(files: Array<File>) {
-        const file = await files[0].text();
-        return file
-
+        return await files[0].text();
     }
 
     public render() {

diff --git a/ui/test/components/AddGraph.test.tsx b/ui/test/components/AddGraph.test.tsx
@@ -1,11 +1,10 @@
 import {mount} from 'enzyme';
 import React from 'react';
 import AddGraph from "../../src/components/AddGraph/AddGraph";
-import {DropzoneArea} from 'material-ui-dropzone'
-import Dropzone from 'react-dropzone'
-import {fireEvent, render} from '@testing-library/react'
-import { act } from 'react-dom/test-utils';
+import {DropzoneArea} from 'material-ui-dropzone';
+
 const wrapper = mount(<AddGraph/>);
+
 describe('When AddGraph mounts', () => {
 
     it('should have a Graph Id text field', () => {
@@ -24,8 +23,6 @@ describe('When AddGraph mounts', () => {
         const submitButton = wrapper.find('button').at(2).text();
         expect(submitButton).toBe("Add Graph");
     });
-
-
 });
 describe('Dropzone behaviour', () => {
     it("should fire onChange handler", () => {

diff --git a/ui/test/components/UserGuide.test.tsx b/ui/test/components/UserGuide.test.tsx
@@ -2,7 +2,9 @@ import {mount} from 'enzyme';
 import React from 'react';
 import UserGuide from "../../src/components/UserGuide/UserGuide";
 import ReactJson from "react-json-view";
+
 const wrapper = mount(<UserGuide/>);
+
 const exampleJSON= {
     "elements": {
         "edges": {
@@ -54,13 +56,8 @@ describe('When UserGuide mounts', () => {
         const exampleSchema = wrapper.find('div.react-json-view');
 
         const display= mount(<ReactJson src={exampleJSON} theme="summerfruit:inverted" displayDataTypes={false} displayObjectSize={false} name={"schema"}/>)
+
         expect(exampleSchema).toHaveLength(1);
         expect(exampleSchema.html()).toBe(display.html())
-
     });
-
-
-
-
-
-});
+});
diff --git a/ui/test/components/__snapshots__/AddGraph.test.tsx.snap b/ui/test/components/__snapshots__/AddGraph.test.tsx.snap