Merge branch 'dev' into jeff

Author: Jeffrey Na

__tests__/charts/HealthChart.test.tsx

@@ -2,8 +2,7 @@ import React from 'react';
 import HealthChart from '../../app/charts/HealthChart';
 import { render, screen } from '@testing-library/react';
 
-// import mockData from '../mock_data.json';
-
+// mockData used for testing suite
 const mockData = {
   ServiceName: {
     Metric: {
@@ -26,11 +25,7 @@ jest.mock('electron', () => ({
   },
 }));
 
-// jest.mock('react-plotly.js', () => (props) {
-//   const div = document.createElement('div');
-
-// })
-
+// test suite for HealthChart.tsx
 describe('HealthChart', () => {
   const props = {
     key: 'testKey',
@@ -63,39 +58,8 @@ describe('HealthChart', () => {
     expect(graph.scrollTop).toBe(0);
   });
 
-  // it('Should have width 800, height 600, and white background', () => {
-  //   // console.log('graph', graph.firstChild);
-  //   console.log('graph.outerHTML: ', graph.outerHTML);
-
-  //   expect(graph.outerHTML.includes('width: 800px')).toBeTruthy();
-  //   expect(graph.outerHTML.includes('height: 600px')).toBeTruthy();
-  //   expect(graph.outerHTML.includes('style="background: white;"')).toBeTruthy();
-  // });
-
-  // it('Should have correct colors', () => {
-  //   expect(graph.outerHTML.includes('{fill: #fc4039;}')).toBeTruthy();
-  // });
-
   it('Should have correct data on y-axis based off mock data', () => {
     expect(graph.data[0].y[0]).toBe((mockData.ServiceName.Metric.value[0] / 1000000).toFixed(2));
     expect(graph.data[0].y[1]).toBe((mockData.ServiceName.Metric.value[1] / 1000000).toFixed(2));
   });
-
-  // it('Should have correct time on x-axis based off mock data', () => {
-  //   const expectedOutput = ['15:18:25', '15:18:20', '15:18:15', '15:18:10', '15:18:05'];
-
-  //   expect(graph.data[0].x[0]).toEqual(expectedOutput[0]);
-  //   expect(graph.data[0].x[1]).toEqual(expectedOutput[1]);
-  // });
-
-  // it('Should have the correct service name on the graph', () => {
-  //   expect(graph).outerHTML.includes('title').toBe('ServiceName');
-  // });
-
-  // describe('prettyTimeInReverse', () => {
-  //   test('Should reverse time and format properly', () => {
-  //     const result = HealthChart.prettyTimeInReverse(mockData.ServiceName.Metric.time);
-  //     expect(result).toEqual(expectedOutput);
-  //   });
-  // });
 });

__tests__/charts/TrafficChart.test.tsx

@@ -65,12 +65,6 @@ describe('Traffic Chart', () => {
     expect(graph._fullLayout.height).toBe(300);
   });
 
-  // it('Should have correct colors', () => {
-  //   expect(graph.outerHTML.includes('{fill: #3f4f75;}')).toBeTruthy();
-  //   expect(graph.outerHTML.includes('{fill: #80cfbe;}')).toBeTruthy();
-  //   expect(graph.outerHTML.includes('{fill: #fff;}')).toBeTruthy();
-  // });
-
   it('Should have correct data points based off mock data', () => {
     expect(graph.calcdata[0][0].isBlank).toBeFalsy();
     expect(graph.data[0].x).toEqual(['customers']);

__tests__/components/AwaitingApproval.test.tsx

@@ -13,8 +13,8 @@ jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => navigateMock,
 }));
-// const mock = jest.fn(Electron.ipcRenderer.sendSync())
 
+// testing suite for the CreateAdmin.tsx file
 describe('Create Admin Page', () => {
   beforeEach(() => {
     render(

__tests__/components/FirstLaunch.test.tsx

@@ -7,7 +7,7 @@ import { HashRouter as Router } from 'react-router-dom';
 
 jest.mock('electron', () => ({ ipcRenderer: { sendSync: jest.fn() } }));
 
-describe('Create Admin Page', () => {
+describe('Create Signup Page', () => {
   beforeEach(() => {
     render(
       <Router>
@@ -43,35 +43,5 @@ describe('Create Admin Page', () => {
     fireEvent.change(username, { target: { value: 'me' } });
     fireEvent.change(password, { target: { value: 'me123' } });
     fireEvent.click(signupButton);
-
-    // expect(ipcRenderer.sendSync).toHaveBeenCalledTimes(1);
-    // expect(ipcRenderer.sendSync).toHaveBeenCalledWith('addUser', {
-    //   username: 'me',
-    //   email: '[email protected]',
-    //   password: 'me123',
-    // });
   });
 });
-
-// describe('handle submit function', () => {
-//   beforeEach(() => {
-//     render(
-//       <Router>
-//         <DashboardContextProvider>
-//           <SignUp />
-//         </DashboardContextProvider>
-//       </Router>
-//     );
-//   });
-
-//   it('should show error message when passwords don\'t match', () => {
-//     const element = screen.getByTestId('SignUp');
-//     const inputs = element.querySelectorAll('input');
-//     inputs[0].value = 'me';
-//     inputs[1].value = '[email protected]';
-//     inputs[2].value = 'me123';
-//     inputs[3].value = 'me1234';
-//     fireEvent.submit(element);
-//     expect(screen.getByText('Entered passwords do not match')).toBeInTheDocument();
-//   })
-// })

__tests__/components/Login.test.tsx

@@ -1,23 +1,6 @@
 import type { Config } from '@jest/types';
 
-// module.exports = {
-//   verbose: true,
-//   setupFilesAfterEnv: ['./jest_setup/windowMock.js'],
-//   testEnvironment: "jsdom",
-//   preset: 'ts-jest/presets/js-with-ts',
-//   moduleNameMapper: {
-//     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-//       '<rootDir>/jest_setup/fileMock.js',
-//     '\\.(css|less|scss)$': '<rootDir>/jest_setup/styleMock.js',
-//   },
-//   collectCoverage: true,
-//   // types: ["jest","node"],
-// };
-
-// Convert to TypeScript
-// Note: Configuring Jest to TypeScript following the docs seemed incorrect? 
-// @jest/types is an npm package to use to create a typed Jest config 
-
+// describes the jest testing configuration for all test files
 const config: Config.InitialOptions = {
   verbose: true,
   setupFilesAfterEnv: ['./jest_setup/windowMock.js'],
@@ -32,4 +15,4 @@ const config: Config.InitialOptions = {
   collectCoverage: true,
 };
 
-export default config;
+export default config;