Merge branch 'dev' into README/ethan

Author: esclarsky

__tests__/businessReducer.js

@@ -1,55 +1,59 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React from 'react';
-import { configure, shallow } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
 import ProtocolSelect from '../src/client/components/composer/NewRequest/ProtocolSelect.jsx';
 
-configure({ adapter: new Adapter() });
+// Commented out this file since it is using Enzyme, which has been falling out of favor and currently does not work for this app version
+// TODO: for the next tester, recommended to migrate to React Testing Library
 
-describe('GraphQL Composer', () => {
-  const state = {
-    currentTab: 'First Tab',
-    reqResArray: [],
-    history: [],
-    warningMessage: '',
-    newRequestFields: {
-      method: 'GET',
-      protocol: '',
-      url: '',
-      graphQL: false,
-    },
-    newRequestHeaders: {
-      headersArr: [],
-      count: 0,
-    },
-    newRequestCookies: {
-      cookiesArr: [],
-      count: 0,
-    },
-    newRequestBody: {
-      bodyContent: '',
-      bodyType: 'raw',
-      rawType: 'text/plain',
-      JSONFormatted: true,
-      bodyVariables: '',
-    },
-  };
-  describe('Setting GQL fields, headers, and body', () => {
-    describe('ProtocolSelect', () => {
-      let wrapper;
-      const props = {
-        currentProtocol: '',
-        onChangeHandler: jest.fn(),
-        graphQL: false,
-      };
+// import { configure, shallow } from 'enzyme';
+// import Adapter from 'enzyme-adapter-react-16';
 
-      beforeAll(() => {
-        wrapper = shallow(<ProtocolSelect {...props} />);
-      });
+// configure({ adapter: new Adapter() });
 
-      it('Renders a <div>', () => {
-        expect(wrapper.type()).toEqual('div');
-      });
-    });
-  });
-});
+// describe('GraphQL Composer', () => {
+//   const state = {
+//     currentTab: 'First Tab',
+//     reqResArray: [],
+//     history: [],
+//     warningMessage: '',
+//     newRequestFields: {
+//       method: 'GET',
+//       protocol: '',
+//       url: '',
+//       graphQL: false,
+//     },
+//     newRequestHeaders: {
+//       headersArr: [],
+//       count: 0,
+//     },
+//     newRequestCookies: {
+//       cookiesArr: [],
+//       count: 0,
+//     },
+//     newRequestBody: {
+//       bodyContent: '',
+//       bodyType: 'raw',
+//       rawType: 'text/plain',
+//       JSONFormatted: true,
+//       bodyVariables: '',
+//     },
+//   };
+//   describe('Setting GQL fields, headers, and body', () => {
+//     describe('ProtocolSelect', () => {
+//       let wrapper;
+//       const props = {
+//         currentProtocol: '',
+//         onChangeHandler: jest.fn(),
+//         graphQL: false,
+//       };
+
+//       beforeAll(() => {
+//         wrapper = shallow(<ProtocolSelect {...props} />);
+//       });
+
+//       it('Renders a <div>', () => {
+//         expect(wrapper.type()).toEqual('div');
+//       });
+//     });
+//   });
+// });

__tests__/composerTests.js

@@ -52,5 +52,3 @@ describe('db test', () => {
     });
   });
 });
-// describe("collection tests", () => {});
-// });

__tests__/dbTests.js

@@ -1,6 +1,11 @@
 import ReqResCtrl from '../src/client/controllers/reqResController';
 
-xdescribe('REST API Requests', () => {
+// TODO: Integration tests with the actual API. The controller calls api.send and api.recieve
+// without attachement to the API, the tests in this file don't perform anything.
+// Additionally, add a testing file for graphQLController. This is currently untested
+// and is a dependency for reqResController.
+
+describe('REST API Requests', () => {
   let state;
   beforeEach(() => {
     state = {
@@ -104,9 +109,13 @@ xdescribe('REST API Requests', () => {
         tab: 'First Tab',
       };
 
-      ReqResCtrl.openReqRes(request);
+      state = ReqResCtrl.openReqRes(request);
       const response = state.reqResArray[0];
       expect(response.toEqual('hello'));
     });
+
+    it('should toggle select all',()=>{
+      expect(ReqResCtrl.toggleSelectAll()).not.toThrowError;
+    })
   });
 });

__tests__/httpTest.js

@@ -0,0 +1,20 @@
+const fs = require('fs');
+const path = require('path');
+
+import openapiParserFunc from '../main_process/openapiParser'
+
+// TODO: Test actual contents of the parser
+
+describe('openAPI Parser tests',()=>{
+  const file = fs.readFileSync(path.resolve(__dirname + '/../test/openAPITestDefinition.yaml'))
+
+  it('should be able to parse a yaml file',()=>{
+    const { openapiMetadata, openapiReqArray } = openapiParserFunc(String(file))
+    expect(openapiMetadata).toBeDefined();
+    expect(openapiReqArray).toBeDefined();
+  })
+
+  it('should error on undefined input',()=>{
+    expect(openapiParserFunc(null)).toThrow(ReferenceError);
+  })
+});

__tests__/openAPIParserTest.js

@@ -1,11 +1,16 @@
-import uiReducer from '../src/client/reducers/ui';
+import reducer,{ 
+  setSidebarActiveTab, 
+  setWorkspaceActiveTab,
+  setResponsePaneActiveTab,
+  toggleDarkMode,
+ } from '../src/client/features/ui/uiSlice.ts';
 
 describe('UI Reducer', () => {
   let state;
 
   beforeEach(() => {
     state = {
-      composerDisplay: 'Request',
+      isDark: false,
       sidebarActiveTab: 'composer',
       workspaceActiveTab: 'workspace',
       responsePaneActiveTab: 'events',
@@ -14,22 +19,57 @@ describe('UI Reducer', () => {
 
   describe('default state', () => {
     it('should return a default state when given an undefined input', () => {
-      expect(uiReducer(undefined, { type: undefined })).toEqual(state);
+      expect(reducer(undefined, { type: undefined })).toEqual(state);
     });
     it('should return default state with unrecognized action types', () => {
-      expect(uiReducer(undefined, { type: 'BAD_TYPE' })).toEqual(state);
+      expect(reducer(undefined, { type: 'BAD_TYPE' })).toEqual(state);
+    });
+  });
+  
+  describe('Set sidebar active tab', () => {
+    const action = {
+      payload: 'the active sidebar tab is this one!',
+    };
+
+    it('sets the sidebar active tab', () => {
+      const { sidebarActiveTab } = reducer(state, setSidebarActiveTab(action.payload));
+      expect(sidebarActiveTab).toEqual(action.payload);
+    });
+  });
+
+  describe('Set workspace active tab', () => {
+    const action = {
+      payload: 'the active workspace tab is this one!',
+    };
+
+    it('sets the workspace active tab', () => {
+      const { workspaceActiveTab } = reducer(state, setWorkspaceActiveTab(action.payload));
+      expect(workspaceActiveTab).toEqual(action.payload);
     });
   });
 
-  describe('should handle SET_COMPOSER_DISPLAY', () => {
+  describe('Set response pane active tab', () => {
     const action = {
-      type: 'SET_COMPOSER_DISPLAY',
-      payload: 'warning',
+      payload: 'the active response pane tab is this one!',
     };
 
-    it('should update the composerDisplay', () => {
-      const { composerDisplay } = uiReducer(state, action);
-      expect(composerDisplay).toEqual(action.payload);
+    it('sets the response pane active tab', () => {
+      const { responsePaneActiveTab } = reducer(state, setResponsePaneActiveTab(action.payload));
+      expect(responsePaneActiveTab).toEqual(action.payload);
     });
   });
+
+  describe('Toggle dark mode', () => {
+    const action = {
+      payload: true,
+    };
+
+    it('Toggles dark mode', () => {
+      const newState = reducer(state, toggleDarkMode(false));
+      expect(newState.isDark).toEqual(false);
+      const { isDark } = reducer(newState, toggleDarkMode(action.payload));
+      expect(isDark).toEqual(true);
+    });
+  });
+
 });

__tests__/uiReducer.js

@@ -117,8 +117,8 @@ function createWindow() {
   mainWindow = new BrowserWindow({
     width: 2000,
     height: 1000,
-    minWidth: 1304,
-    minHeight: 700,
+    minWidth: 1000,
+    minHeight: 600,
     backgroundColor: '-webkit-linear-gradient(top, #3dadc2 0%,#2f4858 100%)',
     show: false,
     webPreferences: {