Remove dead code

sillsdev · Aug 11, 2023 · d118cb8 · d118cb8
1 parent a640213
commit d118cb8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/src/components/GoalTimeline/Redux/GoalActions.ts b/src/components/GoalTimeline/Redux/GoalActions.ts
@@ -9,7 +9,6 @@ import {
   incrementCurrentGoalStepAction,
   loadUserEditsAction,
   setCurrentGoalAction,
-  // setCurrentGoalIndexAction,
   setCurrentGoalsStateAction,
   setGoalDataAction,
   updateStepFromDataAction,
@@ -45,10 +44,6 @@ export function setCurrentGoal(goal?: Goal): PayloadAction {
   return setCurrentGoalAction({ ...goal });
 }
 
-// export function setCurrentGoalIndex(index: number): PayloadAction {
-//   return setCurrentGoalIndexAction(index);
-// }
-
 export function setCurrentGoalStatus(status: GoalStatus): PayloadAction {
   return setCurrentGoalsStateAction(status);
 }

diff --git a/src/components/GoalTimeline/Redux/GoalReducer.ts b/src/components/GoalTimeline/Redux/GoalReducer.ts
@@ -43,9 +43,6 @@ export const goalSlice = createSlice({
           ? state.currentGoal.goalType
           : state.previousGoalType;
     },
-    // setCurrentGoalIndexAction: (state, action) => {
-    //   state.currentGoal.index = action.payload;
-    // },
     setCurrentGoalsStateAction: (state, action) => {
       state.currentGoal.status = action.payload;
     },
@@ -70,16 +67,11 @@ export const goalSlice = createSlice({
     builder.addCase(StoreActionTypes.RESET, () => defaultState),
 });
 
-// export const actionType = (actionName: string) => {
-//   return `${goalSlice.name}/${actionName}Action`;
-// };
-
 export const {
   addCompletedMergeToGoalAction,
   incrementCurrentGoalStepAction,
   loadUserEditsAction,
   setCurrentGoalAction,
-  // setCurrentGoalIndexAction,
   setCurrentGoalsStateAction,
   setGoalDataAction,
   updateStepFromDataAction,

diff --git a/src/components/GoalTimeline/tests/GoalRedux.test.tsx b/src/components/GoalTimeline/tests/GoalRedux.test.tsx
@@ -11,7 +11,6 @@ import {
   asyncAdvanceStep,
   asyncGetUserEdits,
   asyncUpdateGoal,
-  setCurrentGoal,
 } from "components/GoalTimeline/Redux/GoalActions";
 import {
   CharacterChange,
@@ -163,20 +162,6 @@ describe("asyncGetUserEdits", () => {
   });
 });
 
-describe("asyncAddCompletedMergeToGoal", () => {
-  it("dispatch action", async () => {
-    const store = setupStore();
-    await act(async () => {
-      renderWithProviders(<GoalTimeline />, { store: store });
-      store.dispatch(setCurrentGoal(new MergeDups()));
-      store.dispatch(asyncAddCompletedMergeToGoal(mockCompletedMerge));
-    });
-    const changes = store.getState().goalsState.currentGoal
-      .changes as MergesCompleted;
-    expect(changes.merges).toEqual([mockCompletedMerge]);
-  });
-});
-
 describe("asyncAddGoal", () => {
   it("new MergeDups goal", async () => {
     LocalStorage.setCurrentUser(mockUser);
@@ -293,7 +278,7 @@ describe("asyncUpdateGoal", () => {
     await act(async () => {
       renderWithProviders(<GoalTimeline />, { store: store });
     });
-    // create mergeDups goal
+    // create CreateCharInv goal
     const goal = new CreateCharInv();
     await act(async () => {
       store.dispatch(asyncAddGoal(goal));
@@ -317,4 +302,32 @@ describe("asyncUpdateGoal", () => {
     //  - backend is called to addGoalToUserEdit
     expect(mockAddGoalToUserEdit).toBeCalled();
   });
+  it("update MergeDups goal", async () => {
+    // setup the test scenario
+    LocalStorage.setCurrentUser(mockUser);
+    LocalStorage.setProjectId("123");
+    const store = setupStore();
+    await act(async () => {
+      renderWithProviders(<GoalTimeline />, { store: store });
+    });
+    // create MergeDups goal
+    const goal = new MergeDups();
+    await act(async () => {
+      store.dispatch(asyncAddGoal(goal));
+    });
+    //   - dispatch asyncUpdateGoal(new goal)
+    await act(async () => {
+      await store.dispatch(asyncAddCompletedMergeToGoal(mockCompletedMerge));
+      await store.dispatch(
+        asyncUpdateGoal(store.getState().goalsState.currentGoal)
+      );
+    });
+    // verify:
+    //  - current value is now new goal
+    const changes = store.getState().goalsState.currentGoal
+      .changes as MergesCompleted;
+    expect(changes.merges).toEqual([mockCompletedMerge]);
+    //  - backend is called to addGoalToUserEdit
+    expect(mockAddGoalToUserEdit).toBeCalled();
+  });
 });