Merge pull request #3 from annieshinn/cleanUp

Initial clean up

Author: sharon-zhu

src/__tests__/globalReducer.test.js

@@ -179,14 +179,14 @@ describe('Global Reducer works properly', () => {
     });
   });
 
-  it('should handle UPDATE_FILE_SHOW', () => {
-    let action = { type: 'UPDATE_FILE_SHOW', testString: '' };
+  it('should handle UPDATE_FILE', () => {
+    let action = { type: 'UPDATE_FILE', testString: '' };
     expect(globalReducer(initialState, action)).toEqual({
       ...initialState,
       file: '',
     });
     action = {
-      type: 'UPDATE_FILE_SHOW',
+      type: 'UPDATE_FILE',
       testString: `import React from "react";
       import { render, fireEvent } from '@testing-library/react';
       import '@testing-library/jest-dom/extend-expect`,

src/components/Modals/Modal.jsx

@@ -1,3 +1,8 @@
+/*
+ * Handles modals that pop up from pressing buttons "New Test +" or "Run Test",
+ * which render on the top Test Menu component.
+ */
+
 import React from 'react';
 import ReactModal from 'react-modal';
 import styles from './ExportFileModal.module.scss';
@@ -16,7 +21,7 @@ const Modal = ({
     dispatchToMockData,
     dispatchTestCase,
     createTest,
-    closeModal
+    closeModal,
   );
 
   const script = useGenerateScript(title);
@@ -32,7 +37,7 @@ const Modal = ({
       className={styles.modal}
       isOpen={isModalOpen}
       onRequestClose={closeModal}
-      contentLabel='Save?'
+      contentLabel="Save?"
       shouldCloseOnOverlayClick={true}
       shouldCloseOnEsc={true}
       ariaHideApp={false}
@@ -42,28 +47,38 @@ const Modal = ({
         <p>{title === 'New Test' ? title : 'Copy to Terminal'}</p>
       </div>
       <div id={styles.body}>
-        {title === 'New Test' ? (
-          <p id={styles.text}>
-            Do you want to start a new test? All unsaved changes <br /> will be lost.{' '}
-          </p>
-        ) : (
-          <pre>
-            <div className='code-wrapper'>
-              <code ref={codeRef}>{script}</code>
-              <p id={styles.endpoint}>Note if you are using Create React App do not install jest</p>
-            </div>
-          </pre>
-        )}
-        <span id={styles.newTestButtons}>
-          {title === 'New Test' ? (
-            <button id={styles.save} onClick={handleNewTest}>
-              {title}
-            </button>
-          ) : (
-            <button id={styles.save} onClick={handleCopy}>
-              {copySuccess ? 'Copied!' : 'Copy'}
-            </button>
+        {title === 'New Test'
+          ? (
+            <p id={styles.text}>
+              Do you want to start a new test? All unsaved changes
+              <br />
+              will be lost.
+            </p>
+          )
+          : (
+            <pre>
+              <div className="code-wrapper">
+                <code ref={codeRef}>
+                  {script}
+                </code>
+                <p id={styles.endpoint}>
+                  Note if you are using Create React App do not install jest
+                </p>
+              </div>
+            </pre>
           )}
+        <span id={styles.newTestButtons}>
+          {title === 'New Test'
+            ? (
+              <button id={styles.save} onClick={handleNewTest}>
+                {title}
+              </button>
+            )
+            : (
+              <button id={styles.save} onClick={handleCopy}>
+                {copySuccess ? 'Copied!' : 'Copy'}
+              </button>
+            )}
           <button id={styles.save} onClick={closeModal}>
             Cancel
           </button>

src/components/TestMenu/EndpointTestMenu.tsx

@@ -27,7 +27,6 @@ const EndpointTestMenu = () => {
   const [{ projectFilePath, file, exportBool }, dispatchToGlobal] = useContext<any>(GlobalContext);
   const { title, isModalOpen, openModal, openScriptModal, closeModal } = useToggleModal('endpoint');
   const generateTest = useGenerateTest('endpoint', projectFilePath);
-  let valid;
   // Endpoint testing docs url
   const endpointUrl = 'https://www.npmjs.com/package/supertest';
 
@@ -59,8 +58,8 @@ const EndpointTestMenu = () => {
   };
 
   if (exportBool) {
-    valid = validateInputs('endpoint', endpointTestCase);
-    valid ? dispatchToGlobal(setValidCode(true)) : dispatchToGlobal(setValidCode(false));
+    const valid = validateInputs('endpoint', endpointTestCase);
+    dispatchToGlobal(setValidCode(valid));
     dispatchToGlobal(toggleExportBool());
     if (valid && !file) dispatchToGlobal(updateFile(generateTest(endpointTestCase)));
   }

src/components/TestMenu/HooksTestMenu.tsx

@@ -18,7 +18,6 @@ import { useToggleModal, validateInputs } from './testMenuHooks';
 const HooksTestMenu = () => {
   // Hooks testing docs url
   const hooksUrl = 'https://react-hooks-testing-library.com/usage/basic-hooks';
-  let valid;
   const [{ hooksTestStatement, hooksStatements }, dispatchToHooksTestCase] = useContext(
     HooksTestCaseContext
   );
@@ -45,16 +44,15 @@ const HooksTestMenu = () => {
   };
 
   if (exportBool) {
-    valid = validateInputs('hooks', hooksStatements);
-    valid ? dispatchToGlobal(setValidCode(true)) : dispatchToGlobal(setValidCode(false));
+    const valid = validateInputs('hooks', hooksStatements);
+    dispatchToGlobal(setValidCode(valid));
     dispatchToGlobal(toggleExportBool());
     if (valid && !file) dispatchToGlobal(updateFile(generateTest(hooksStatements)));
   }
 
   if (!file && exportBool) {
-    validateInputs('hooks', hooksStatements)
-      ? dispatchToGlobal(setValidCode(true))
-      : dispatchToGlobal(setValidCode(false));
+    const valid = validateInputs('hooks', hooksStatements);
+    dispatchToGlobal(setValidCode(valid));
     dispatchToGlobal(updateFile(generateTest({ hooksTestStatement, hooksStatements })));
   }
   return (

src/context/actions/globalActions.js

@@ -13,10 +13,10 @@ export const actionTypes = {
   //added
   SET_TEST_CASE: 'SET_TEST_CASE',
   TOGGLE_MODAL: 'TOGGLE_MODAL',
-  UPDATE_FILE_SHOW: 'UPDATE_FILE_SHOW',
+  UPDATE_FILE: 'UPDATE_FILE',
   OPEN_BROWSER_DOCS: 'OPEN_BROWSER_DOCS',
-  NEW_TEST_CLOSE_BROWSER_DOCS: 'NEW_TEST_CLOSE_BROWSER_DOCS',
-  EXPORT: 'EXPORT',
+  RESET_TO_PROJECT_URL: 'RESET_TO_PROJECT_URL', // formerly NEW_TEST_CLOSE_BROWSER_DOCS
+  TOGGLE_EXPORT_BOOL: 'TOGGLE_EXPORT_BOOL',
   SET_FILE_PATH: 'SET_FILE_PATH',
   SET_VALID_CODE: 'SET_VALID_CODE',
 };
@@ -80,7 +80,7 @@ export const toggleModal = () => ({
 });
 
 export const updateFile = (testString) => ({
-  type: actionTypes.UPDATE_FILE_SHOW,
+  type: actionTypes.UPDATE_FILE,
   testString,
 });
 
@@ -89,20 +89,20 @@ export const openBrowserDocs = (docsUrl) => ({
   docsUrl,
 });
 
+export const resetToProjectUrl = () => ({
+  type: actionTypes.RESET_TO_PROJECT_URL,
+});
+
 export const toggleExportBool = () => ({
-  type: actionTypes.EXPORT,
+  type: actionTypes.TOGGLE_EXPORT_BOOL,
 });
 
 export const setFilePath = (filePath) => ({
   type: actionTypes.SET_FILE_PATH,
   filePath,
 });
 
-export const resetToProjectUrl = () => ({
-  type: actionTypes.NEW_TEST_CLOSE_BROWSER_DOCS,
-});
-
-export const setValidCode = (verdict) => ({
+export const setValidCode = (validCode) => ({
   type: actionTypes.SET_VALID_CODE,
-  validCode: verdict,
+  validCode,
 });

src/context/reducers/globalReducer.js

@@ -37,9 +37,10 @@ export const globalReducer = (state, action) => {
         projectUrl: url,
       };
     case actionTypes.LOAD_PROJECT:
+      const isProjectLoaded = action.load;
       return {
         ...state,
-        isProjectLoaded: action.load,
+        isProjectLoaded,
       };
     case actionTypes.CREATE_FILE_TREE:
       const fileTree = action.fileTree;
@@ -49,10 +50,9 @@ export const globalReducer = (state, action) => {
       };
 
     case actionTypes.TOGGLE_FILE_DIRECTORY:
-      const isFileDirectoryOpen = !state.isFileDirectoryOpen;
       return {
         ...state,
-        isFileDirectoryOpen,
+        isFileDirectoryOpen: !state.isFileDirectoryOpen,
       };
     case actionTypes.CLOSE_RIGHT_PANEL:
       const projUrl = state.projectUrl;
@@ -111,11 +111,11 @@ export const globalReducer = (state, action) => {
         isTestModalOpen: !state.isTestModalOpen,
       };
     //
-    case actionTypes.UPDATE_FILE_SHOW:
-      const updatedFile = action.testString;
+    case actionTypes.UPDATE_FILE:
+      const file = action.testString;
       return {
         ...state,
-        file: updatedFile,
+        file,
       };
     case actionTypes.OPEN_BROWSER_DOCS:
       const docsUrl = action.docsUrl;
@@ -125,18 +125,18 @@ export const globalReducer = (state, action) => {
         isRightPanelOpen: true,
         rightPanelDisplay: 'browserView',
       };
-    case actionTypes.NEW_TEST_CLOSE_BROWSER_DOCS:
+    case actionTypes.RESET_TO_PROJECT_URL:
+      // formerly NEW_TEST_CLOSE_BROWSER_DOCS
       const urlReset = state.projectUrl;
       return {
         ...state,
         url: urlReset,
         projectUrl: urlReset,
       };
-    case actionTypes.EXPORT:
-      let exportBool = !state.exportBool;
+    case actionTypes.TOGGLE_EXPORT_BOOL:
       return {
         ...state,
-        exportBool,
+        exportBool: !state.exportBool,
       };
     case actionTypes.SET_FILE_PATH:
       const filePath = action.filePath;
@@ -145,9 +145,10 @@ export const globalReducer = (state, action) => {
         filePath,
       };
     case actionTypes.SET_VALID_CODE:
+      const validCode = action.validCode;
       return {
         ...state,
-        validCode: action.validCode,
+        validCode,
       };
     default:
       return state;