Merge branch 'test' of https://github.com/tdwolf6/Chronos into staging-master

Author: ronellecaguioa

__tests__/app/containers/DashboardContainer.test.tsx

@@ -1,5 +1,39 @@
-xdescribe('<DashboardContainer />', () => {
-  it('should render <SidebarContainer />');
-  it('should render <MainContainer />');
-  it('should render all of the contexts');
+import React from 'react';
+import { configure, shallow, render } from 'enzyme';
+// import Adapter from 'enzyme-adapter-react-16';
+// import renderer from 'react-test-renderer';
+// import { expect } from 'chai';
+import DashboardContainer from '../../../app/containers/DashboardContainer';
+import MainContainer from '../../../app/containers/MainContainer'
+import SidebarContainer from '../../../app/containers/SidebarContainer'
+import ApplicationContextProvider from '../../../app/context/ApplicationContext'
+// configure({ adapter: new Adapter() });
+
+describe('<DashboardContainer />', () => {
+  it(' renders component MainContainer ', () => {
+    const wrapper = shallow(<DashboardContainer />);
+
+    expect(wrapper.contains(<MainContainer />)).toBe(true);
+    expect(wrapper.contains(<SidebarContainer />)).toBe(true);
+  });
+
+  it(' renders component SidebarContainer', () => {
+    const wrapper = shallow(<DashboardContainer />);
+
+    expect(wrapper.contains(<SidebarContainer />)).toBe(true);
+  });
+  //   it(' renders component SidebarContainer', () => {
+  //   const wrapper = shallow(<DashboardContainer />);
+
+  //   expect(wrapper.contains( <ApplicationContextProvider></ApplicationContextProvider>)).toBe(true);
+  // });
+  
 });
+
+
+
+// describe('<DashboardContainer />', () => {
+//   it('should render <SidebarContainer />');
+//   it('should render <MainContainer />');
+//   it('should render all of the contexts');
+// });

__tests__/app/containers/GraphsContainer.test.tsx

@@ -1,3 +1,16 @@
+import React from 'react';
+import { configure, shallow, render } from 'enzyme';
+
+import GraphsContainer from '../../../app/containers/GraphsContainer'
+// import SpeedChart from '../../../app/charts/speed-chart'
+
 xdescribe('<GraphsContainer />', () => {
-  it('should');
-});
+  it('should render graphs')
+})
+
+// xdescribe('<GraphsContainer />', () => {
+//   it('should', () => {
+//     const wrapper = shallow(<GraphsContainer />);
+//     expect(wrapper.contains(<SpeedChart/>)).toBe(true)
+//   });
+// });

__tests__/app/containers/MainContainer.test.tsx

@@ -1,3 +1,60 @@
-xdescribe('<MainContainer />', () => {
-  it('should');
+import React from 'react';
+import { configure, shallow, render } from 'enzyme';
+import { Route, Switch } from 'react-router-dom';
+
+
+import MainContainer from '../../../app/containers/MainContainer'
+import Home from '../../../app/components/Home'
+import Copyright from '../../../app/components/Copyright'
+import Occupied from '../../../app/components/Occupied'
+import GraphsContainer from '../../../app/containers/GraphsContainer'
+import About from '../../../app/components/About'
+import Contact from '../../../app/components/Contact';
+import Settings from '../../../app/components/Settings';
+
+describe('<MainContainer />', () => {
+  it(' renders component Home', () => {
+    const wrapper = shallow(<MainContainer />);
+
+    expect(wrapper.contains(<Route exact path="/" component={Home} />)).toBe(true);
+  });
+  it('renders component Copyright', () => {
+    const wrapper = shallow (<MainContainer />);
+
+    expect(wrapper.contains(<Copyright />)).toBe(true);
+
+  })
+  it('renders component Occupied', () => {
+    const wrapper = shallow (<MainContainer />);
+
+    expect(wrapper.contains(<Route exact path="/applications" component={Occupied} />)).toBe(true);
+
+  })
+   it('renders container GraphsContainer', () => {
+    const wrapper = shallow (<MainContainer />);
+
+    expect(wrapper.contains(<Route exact path="/applications/:app/:service" component={GraphsContainer} />)).toBe(true);
+
+  })
+  it('renders container About', () => {
+    const wrapper = shallow (<MainContainer />);
+
+    expect(wrapper.contains(<Route path="/about" component={About} />)).toBe(true);
+
+  })
+  it('renders container Contact', () => {
+    const wrapper = shallow (<MainContainer />);
+
+    expect(wrapper.contains(<Route path="/contact" component={Contact} />)).toBe(true);
+
+  })
+  it('renders container Settings', () => {
+    const wrapper = shallow (<MainContainer />);
+
+    expect(wrapper.contains(<Route path="/settings" component={Settings} />)).toBe(true);
+
+  })
+  
 });
+
+

__tests__/app/containers/SidebarContainer.test.tsx

@@ -1,7 +1,61 @@
-xdescribe('<SidebarContainer />', () => {
-  it('should render an <img> tag with the Chronos logo');
-  it("should render a <Link /> with the label as 'Home'");
-  it("should render a <Link /> with the label as 'About'");
-  it("should render a <Link /> with the label as 'Contact'");
-  it("should render a <Link /> with the label as 'Settings'");
+import React from 'react';
+import { configure, shallow, render } from 'enzyme';
+
+import HomeSharpIcon from '@material-ui/icons/HomeSharp';
+import InfoIcon from '@material-ui/icons/Info';
+import ContactSupportIcon from '@material-ui/icons/ContactSupport';
+import SettingsIcon from '@material-ui/icons/Settings';
+import SidebarContainer from '../../../app/containers/SidebarContainer'
+import { Link } from 'react-router-dom';
+
+
+describe('<SidebarContainer />', () => {
+  it('should render an <img> tag with the Chronos logo', () => {
+    const wrapper = shallow(<SidebarContainer />);
+    console.log(wrapper.debug)
+    expect(wrapper.contains(<img alt="Chronos Logo" id="serviceDashLogo" src="../assets/icon2Cropped.png" />)).toBe(true);
+  });
+  it("should render a <Link /> with the label as 'Home'", () => {
+    const wrapper = shallow(<SidebarContainer />);
+
+    expect(wrapper.contains(<Link className="sidebar-link" to="/" id="home">
+    <HomeSharpIcon style={{ boxShadow: 'none', width: '40px', height: '40px' }} />
+    &emsp;Home
+  </Link>)).toBe(true)
+  });
+  it("should render a <Link /> with the label as 'About'", () => {
+    const wrapper = shallow(<SidebarContainer />);
+
+    expect(wrapper.contains(<Link className="sidebar-link" to="/about" id="about">
+    <InfoIcon style={{ boxShadow: 'none', width: '40px', height: '40px' }} />
+    &emsp;About
+  </Link>)).toBe(true)
+  });
+  it("should render a <Link /> with the label as 'Contact'", () => {
+    const wrapper = shallow(<SidebarContainer />);
+
+    expect(wrapper.contains(<Link className="sidebar-link" to="/contact" id="contact">
+    <ContactSupportIcon style={{ boxShadow: 'none', width: '40px', height: '40px' }} />
+    &emsp;Contact
+  </Link>)).toBe(true)
+  });
+  it("should render a <Link /> with the label as 'Settings'", () => {
+    const wrapper = shallow(<SidebarContainer />);
+
+    expect(wrapper.contains(<Link className="sidebar-link" to="/settings" id="settings">
+    <SettingsIcon style={{ boxShadow: 'none', width: '40px', height: '40px' }} />
+    &emsp;Settings
+  </Link>)).toBe(true)
+  });
+
+  
 });
+
+
+
+
+
+
+
+
+  

app/components/About.tsx

@@ -1,4 +1,4 @@
-import React from 'React';
+import React from 'react';
 
 const About: React.FC = () => {
   return <div className="home">Hello this is the About</div>;

app/components/Contact.tsx

@@ -1,4 +1,4 @@
-import React from 'React';
+import React from 'react';
 
 const Contact: React.FC = () => {
   return <div className="home">Hello this is the Contact</div>;

app/components/Settings.tsx

@@ -1,4 +1,4 @@
-import React from 'React';
+import React from 'react';
 
 // Need to add flag to turn off the splash at start
 // Need to add flag to turn off getting started page

package.json

@@ -35,6 +35,7 @@
     "@jest-runner/electron": "^2.0.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
+    "@types/react-test-renderer": "^16.9.2",
     "chart.js": "^2.8.0",
     "d3": "^5.16.0",
     "electron": "^6.1.11",