comment out SHOW_WARNING and HIDE_WARNING actions throughout the app as it was obsolete; Write uiReducer tests; new script to distinguish between mocha and jest

Author: h15200

__tests__/uiReducer.js

@@ -1,39 +1,51 @@
-import reducer from "../src/client/reducers/ui";
+import uiReducer from "../src/client/reducers/ui";
+import { SET_COMPOSER_DISPLAY } from "../src/client/actions/actionTypes";
 
 describe("UI Reducer", () => {
   let state;
 
   beforeEach(() => {
     state = {
-      warningIsDisplayed: null,
       composerDisplay: "Request",
     };
   });
 
-  describe("SHOW_WARNING", () => {
-    const action = { type: "SHOW_WARNING" };
-
-    it("should set warningIsDisplayed to true", () => {
-      const { warningIsDisplayed } = reducer(state, action);
-      expect(warningIsDisplayed).toBe(true);
+  describe("default state", () => {
+    it("should return a default state when given an undefined input", () => {
+      expect(uiReducer(undefined, { type: undefined })).toEqual(state);
     });
-  });
-
-  describe("HIDE_WARNING", () => {
-    const action = { type: "HIDE_WARNING" };
-
-    it("should set warningIsDisplayed to false", () => {
-      const { warningIsDisplayed } = reducer(state, action);
-      expect(warningIsDisplayed).toBe(false);
+    it("should return default state with unrecognized action types", () => {
+      expect(uiReducer(undefined, { type: "BAD_TYPE" })).toEqual(state);
     });
   });
 
-  describe("SET_COMPOSER_DISPLAY", () => {
-    const action = { type: "SET_COMPOSER_DISPLAY", payload: "CHANGE" };
-
+  describe("should handle SET_COMPOSER_DISPLAY", () => {
     it("should update the composerDisplay", () => {
-      const { composerDisplay } = reducer(state, action);
-      expect(composerDisplay).toEqual(action.payload);
+      const action = {
+        type: SET_COMPOSER_DISPLAY,
+        payload: "Warning",
+      };
+      expect(uiReducer(undefined, action)).toEqual({
+        composerDisplay: "Warning",
+      });
     });
   });
+
+  // describe("SHOW_WARNING", () => {
+  //   const action = { type: "SHOW_WARNING" };
+
+  //   it("should set warningIsDisplayed to true", () => {
+  //     const { warningIsDisplayed } = reducer(state, action);
+  //     expect(warningIsDisplayed).toBe(true);
+  //   });
+  // });
+
+  // describe("HIDE_WARNING", () => {
+  //   const action = { type: "HIDE_WARNING" };
+
+  //   it("should set warningIsDisplayed to false", () => {
+  //     const { warningIsDisplayed } = reducer(state, action);
+  //     expect(warningIsDisplayed).toBe(false);
+  //   });
+  // });
 });

package.json

@@ -5,7 +5,7 @@
   "main": "main.js",
   "repository": "https://github.com/open-source-labs/Swell",
   "scripts": {
-    "test": "jest",
+    "test-jest": "jest",
     "test-mocha": "mocha",
     "prod": "webpack --mode production --config webpack.build.config.js && electron --noDevServer .",
     "start": "webpack-dev-server --mode development --hot --host 0.0.0.0 --config=./webpack.dev.config.js ",
@@ -23,8 +23,7 @@
     "email": "swell@getswell.io",
     "url": "http://www.getswell.io"
   },
-  "contributors": [
-    {
+  "contributors": [{
       "name": "Kyle Combs",
       "email": "combskyle@gmail.com",
       "url": "https://github.com/texpatnyc"
@@ -130,8 +129,7 @@
       "createDesktopShortcut": "always"
     },
     "dmg": {
-      "contents": [
-        {
+      "contents": [{
           "x": 130,
           "y": 220
         },

src/client/actions/actionTypes.js

@@ -1,17 +1,17 @@
 // BUSINESS LOGIC ACTIONS
-export const REQRES_CLEAR = 'REQRES_CLEAR';
-export const REQRES_ADD = 'REQRES_ADD';
-export const REQRES_DELETE = 'REQRES_DELETE';
-export const REQRES_UPDATE = 'REQRES_UPDATE';
+export const REQRES_CLEAR = "REQRES_CLEAR";
+export const REQRES_ADD = "REQRES_ADD";
+export const REQRES_DELETE = "REQRES_DELETE";
+export const REQRES_UPDATE = "REQRES_UPDATE";
 
-export const GET_HISTORY = 'GET_HISTORY';
-export const DELETE_HISTORY = 'DELETE_HISTORY';
-export const CLEAR_HISTORY = 'CLEAR_HISTORY';
+export const GET_HISTORY = "GET_HISTORY";
+export const DELETE_HISTORY = "DELETE_HISTORY";
+export const CLEAR_HISTORY = "CLEAR_HISTORY";
 
-export const GET_COLLECTIONS = 'GET_COLLECTIONS';
-export const DELETE_COLLECTION = 'DELETE_COLLECTION';
-export const COLLECTION_TO_REQRES = 'COLLECTION_TO_REQRES';
-export const COLLECTION_ADD = 'COLLECTION_ADD';
+export const GET_COLLECTIONS = "GET_COLLECTIONS";
+export const DELETE_COLLECTION = "DELETE_COLLECTION";
+export const COLLECTION_TO_REQRES = "COLLECTION_TO_REQRES";
+export const COLLECTION_ADD = "COLLECTION_ADD";
 
 export const SET_COMPOSER_WARNING_MESSAGE = "SET_COMPOSER_WARNING_MESSAGE";
 
@@ -26,10 +26,7 @@ export const SET_CURRENT_TAB = "SET_CURRENT_TAB";
 
 export const SET_CHECKS_AND_MINIS = "SET_CHECKS_AND_MINIS";
 
-
-
-
 //UI ACTIONS
-export const SHOW_WARNING = "SHOW_WARNING";
-export const HIDE_WARNING = "HIDE_WARNING";
+// export const SHOW_WARNING = "SHOW_WARNING";
+// export const HIDE_WARNING = "HIDE_WARNING";
 export const SET_COMPOSER_DISPLAY = "SET_COMPOSER_DISPLAY";

src/client/actions/actions.js

@@ -1,12 +1,12 @@
-import * as types from './actionTypes';
+import * as types from "./actionTypes";
 
 // BUSINESS LOGIC ACTIONS
-export const getHistory = history => ({
+export const getHistory = (history) => ({
   type: types.GET_HISTORY,
   payload: history,
 });
 
-export const deleteFromHistory = reqRes => ({
+export const deleteFromHistory = (reqRes) => ({
   type: types.DELETE_HISTORY,
   payload: reqRes,
 });
@@ -15,22 +15,22 @@ export const clearHistory = () => ({
   type: types.CLEAR_HISTORY,
 });
 
-export const getCollections = collections => ({
+export const getCollections = (collections) => ({
   type: types.GET_COLLECTIONS,
   payload: collections,
 });
 
-export const deleteFromCollection = collection => ({
+export const deleteFromCollection = (collection) => ({
   type: types.DELETE_COLLECTION,
   payload: collection,
 });
 
-export const collectionToReqRes = reqResArray => ({
+export const collectionToReqRes = (reqResArray) => ({
   type: types.COLLECTION_TO_REQRES,
   payload: reqResArray,
 });
 
-export const collectionAdd = collection => ({
+export const collectionAdd = (collection) => ({
   type: types.COLLECTION_ADD,
   payload: collection,
 });
@@ -39,55 +39,54 @@ export const reqResClear = () => ({
   type: types.REQRES_CLEAR,
 });
 
-export const reqResAdd = reqRes => ({
+export const reqResAdd = (reqRes) => ({
   type: types.REQRES_ADD,
   payload: reqRes,
 });
 
-export const reqResDelete = reqRes => ({
+export const reqResDelete = (reqRes) => ({
   type: types.REQRES_DELETE,
   payload: reqRes,
 });
 
-export const reqResUpdate = reqRes => ({
+export const reqResUpdate = (reqRes) => ({
   type: types.REQRES_UPDATE,
   payload: reqRes,
 });
 
-export const setComposerWarningMessage = message => ({
+export const setComposerWarningMessage = (message) => ({
   type: types.SET_COMPOSER_WARNING_MESSAGE,
   payload: message,
 });
 
-
 export const setNewRequestFields = (requestObj) => ({
   type: types.SET_NEW_REQUEST_FIELDS,
-  payload : requestObj
+  payload: requestObj,
 });
 
 export const setNewRequestHeaders = (headers) => ({
   type: types.SET_NEW_REQUEST_HEADERS,
-  payload : headers
+  payload: headers,
 });
 
 export const setNewRequestStreams = (streams) => ({
   type: types.SET_NEW_REQUEST_STREAMS,
-  payload : streams
+  payload: streams,
 });
 
 export const setNewRequestBody = (body) => ({
   type: types.SET_NEW_REQUEST_BODY,
-  payload : body
+  payload: body,
 });
 
 export const setNewRequestCookies = (cookies) => ({
   type: types.SET_NEW_REQUEST_COOKIES,
-  payload : cookies
+  payload: cookies,
 });
 
 export const setNewRequestSSE = (SSEBool) => ({
   type: types.SET_NEW_REQUEST_SSE,
-  payload : SSEBool
+  payload: SSEBool,
 });
 
 export const setCurrentTab = (tab) => ({
@@ -100,17 +99,16 @@ export const setChecksAndMinis = (reqResArray) => ({
   payload: reqResArray,
 });
 
-
 // UI ACTIONS
-export const showWarning = () => ({
-  type: types.SHOW_WARNING,
-});
+// export const showWarning = () => ({
+//   type: types.SHOW_WARNING,
+// });
 
-export const hideWarning = () => ({
-  type: types.HIDE_WARNING,
-});
+// export const hideWarning = () => ({
+//   type: types.HIDE_WARNING,
+// });
 
-export const setComposerDisplay = composerDisplay => ({
+export const setComposerDisplay = (composerDisplay) => ({
   type: types.SET_COMPOSER_DISPLAY,
   payload: composerDisplay,
 });

src/client/reducers/ui.js

@@ -1,29 +1,28 @@
 import * as types from "../actions/actionTypes";
 
 const initialState = {
-  warningIsDisplayed: true,
+  // warningIsDisplayed: true,
   composerDisplay: "Request",
 };
 
 const uiReducer = (state = initialState, action) => {
   switch (action.type) {
-    case types.SHOW_WARNING: {
-      return {
-        ...state,
-        warningIsDisplayed: true,
-      };
-    }
+    // case types.SHOW_WARNING: {
+    //   return {
+    //     ...state,
+    //     warningIsDisplayed: true,
+    //   };
+    // }
 
-    case types.HIDE_WARNING: {
-      return {
-        ...state,
-        warningIsDisplayed: false,
-      };
-    }
+    // case types.HIDE_WARNING: {
+    //   return {
+    //     ...state,
+    //     warningIsDisplayed: false,
+    //   };
+    // }
 
     case types.SET_COMPOSER_DISPLAY: {
       return {
-        ...state,
         composerDisplay: action.payload,
       };
     }