Merge branch 'dev' into paused-feature

Author: ElDuke717

src/app/__tests__/ActionContainer.test.tsx

@@ -5,6 +5,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import ActionContainer from '../containers/ActionContainer';
 import { useStoreContext } from '../store';
+import TravelContainer from '../containers/TravelContainer';
 
 const state = {
   tabs: {
@@ -148,3 +149,17 @@ describe('unit testing for ActionContainer', () => {
     await expect(dispatch).toHaveBeenCalledTimes(1);
   });
 });
+
+describe('integration testing for ActionContainer', () => {
+  beforeEach(() => {
+    mockeduseStoreContext.mockClear();
+    dispatch.mockClear();
+    render(<ActionContainer actionView={true} />);
+    render(<TravelContainer snapshotsLength={0} />);
+  });
+
+  test('Slider resets on clear button', () => {
+    fireEvent.click(screen.getAllByRole('button')[0]);
+    expect(screen.getByRole('slider')).toHaveStyle('left: 0');
+  });
+});

src/app/__tests__/ButtonContainer.test.tsx

@@ -26,7 +26,6 @@ describe('Unit testing for ButtonContainer', () => {
         mode: {
           paused: true,
           locked: false,
-          persist: false,
         },
       },
     },

src/app/__tests__/Loader.test.tsx

@@ -6,7 +6,7 @@ import Loader from '../components/Loader';
 describe('unit testing for Loader.tsx', () => {
   test('renders a loading icon', () => {
     const { container } = render(<Loader loading={true} result={false} />);
-    expect(container.firstChild).toHaveClass('css-xp4o0b');
+    expect(container.firstChild).toHaveClass('css-1tm071a');
   });
 
   test('renders a fail icon', () => {

src/app/__tests__enzyme/ignore/ButtonsContainer.test.tsx

@@ -18,7 +18,6 @@ const state = {
       mode: {
         paused: false,
         locked: false,
-        persist: false,
       },
     },
   },
@@ -42,7 +41,6 @@ describe('testing the bottom buttons', () => {
     useStoreContext.mockClear();
     currentTab.mode = {
       paused: false,
-      persist: false,
     };
   });
 
@@ -66,24 +64,4 @@ describe('testing the bottom buttons', () => {
     });
   });
 
-  describe.skip('persist button testing', () => {
-    beforeEach(() => {
-      wrapper.find('.persist-button').simulate('click');
-    });
-
-    test('persist button dispatches upon click', () => {
-      expect(dispatch.mock.calls.length).toBe(1);
-    });
-
-    test('persist button dispatches toggleMode action', () => {
-      expect(dispatch.mock.calls[0][0]).toEqual(toggleMode('persist'));
-    });
-
-    test('persist button displays state', () => {
-      expect(wrapper.find('.persist-button').text()).toBe('<FontAwesomeIcon />Persist');
-      state.tabs[state.currentTab].mode.persist = true;
-      wrapper = shallow(<ButtonsContainer />);
-      expect(wrapper.find('.persist-button').text()).toBe('<FontAwesomeIcon />Unpersist');
-    });
-  });
 });

src/app/__tests__enzyme/ignore/mainReducer.test.tsx

@@ -32,7 +32,6 @@ describe('mainReducer testing', () => {
           mode: {
             paused: false,
             locked: false,
-            persist: false,
           },
           intervalId: 87,
           playing: true,
@@ -116,7 +115,6 @@ describe('mainReducer testing', () => {
           mode: {
             paused: false,
             locked: false,
-            persist: false,
           },
           intervalId: 75,
           playing: false,
@@ -279,25 +277,16 @@ describe('mainReducer testing', () => {
       const { mode } = mainReducer(state, toggleMode('paused')).tabs[currentTab];
       expect(mode.paused).toBe(true);
       expect(mode.locked).toBe(false);
-      expect(mode.persist).toBe(false);
     });
     it('clicking lock button should only change lock mode', () => {
       const { mode } = mainReducer(state, toggleMode('locked')).tabs[currentTab];
       expect(mode.paused).toBe(false);
       expect(mode.locked).toBe(true);
-      expect(mode.persist).toBe(false);
-    });
-    it('clicking persist button should only change persist mode', () => {
-      const { mode } = mainReducer(state, toggleMode('persist')).tabs[currentTab];
-      expect(mode.paused).toBe(false);
-      expect(mode.locked).toBe(false);
-      expect(mode.persist).toBe(true);
     });
     it('undefined payload does nothing', () => {
       const { mode } = mainReducer(state, toggleMode('undefined')).tabs[currentTab];
       expect(mode.paused).toBe(false);
       expect(mode.locked).toBe(false);
-      expect(mode.persist).toBe(false);
     });
   });
 
@@ -326,7 +315,6 @@ describe('mainReducer testing', () => {
         mode: {
           paused: false,
           locked: false,
-          persist: false,
         },
         intervalId: 912,
         playing: true,

src/app/components/Loader.tsx

@@ -17,7 +17,7 @@ const handleResult = (result: boolean): JSX.Element =>
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const Loader = ({ loading, result }): JSX.Element =>
   loading ? (
-    <ClipLoader color='#123abc' size={30} loading={loading} style={{ display: "inline", margin: "0 auto" }}/>
+    <ClipLoader color='#123abc' size={30} loading={loading} />
   ) : (
     handleResult(result)
   );

src/app/reducers/mainReducer.js

@@ -217,9 +217,6 @@ export default (state, action) =>
           case 'paused':
             actionText = 'setPause';
             break;
-          case 'persist':
-            actionText = 'setPersist';
-            break;
           default:
             break;
         }

src/app/styles/layout/_errorContainer.scss

@@ -40,6 +40,10 @@
 		justify-content: center;
 		align-items: center;
 	}
+	.loaderChecks span {
+		margin: 0 auto;
+		display: inline;
+	}
 	h2 {
 		padding-left: 2%;
 		padding-right: 2%;

src/backend/controllers/timeJump.ts

@@ -70,11 +70,14 @@ async function updateReactFiberTree(
   if (index !== null) {
     // Obtain the BOUND update method at the given index
     const classComponent = componentActionsRecord.getComponentByIndex(index);
-    // Update component state
-    await classComponent.setState(
-      // prevState contains the states of the snapshots we are jumping FROM, not jumping TO
-      (prevState) => state,
-    );
+    // This conditional avoids the error that occurs when classComponent is undefined
+    if (classComponent !== undefined) {
+      // Update component state
+      await classComponent.setState(
+        // prevState contains the states of the snapshots we are jumping FROM, not jumping TO
+        (prevState) => state,
+      );
+    }
     // Iterate through new children after state has been set
     targetSnapshot.children.forEach((child) => updateReactFiberTree(child, circularComponentTable));
     return;

src/extension/background.js

@@ -42,10 +42,9 @@ function createTabObj(title) {
       reactDevToolsInstalled: false,
       targetPageisaReactApp: false,
     },
-    // Note: Persist is a now defunct feature. Paused = Locked
+    // Note: Paused = Locked
     mode: {
-      persist: false,
-      paused: true,
+      paused: false,
     },
     // stores web metrics calculated by the content script file
     webMetrics: {},
@@ -204,10 +203,6 @@ chrome.runtime.onConnect.addListener((port) => {
       case 'setPause':
         tabsObj[tabId].mode.paused = payload;
         return true;
-      // persist is now depreacted
-      case 'setPersist':
-        tabsObj[tabId].mode.persist = payload;
-        return true;
       case 'launchContentScript':
         chrome.scripting.executeScript({
           target: { tabId },