fix test cases

Author: tohlh

src/commons/sagas/WorkspaceSaga/helpers/clearContext.ts

@@ -1,30 +1,19 @@
 import type { Context } from 'js-slang';
 import { defineSymbol } from 'js-slang/dist/createContext';
-import { LanguageOptions, Variant } from 'js-slang/dist/types';
 import { put, select, take } from 'redux-saga/effects';
-import { ExternalLibraryName } from 'src/commons/application/types/ExternalTypes';
 import WorkspaceActions from 'src/commons/workspace/WorkspaceActions';
 
 import type { OverallState } from '../../../application/ApplicationTypes';
 import { actions } from '../../../utils/ActionsHelper';
 import type { WorkspaceLocation } from '../../../workspace/WorkspaceTypes';
+import { selectWorkspace } from '../../SafeEffects';
 
 export function* clearContext(workspaceLocation: WorkspaceLocation, entrypointCode: string) {
-  const [chapter, symbols, externalLibraryName, globals, variant, languageOptions]: [
-    number,
-    string[],
-    ExternalLibraryName,
-    Array<[string, any]>,
-    Variant,
-    LanguageOptions
-  ] = yield select((state: OverallState) => [
-    state.workspaces[workspaceLocation].context.chapter,
-    state.workspaces[workspaceLocation].context.externalSymbols,
-    state.workspaces[workspaceLocation].externalLibrary,
-    state.workspaces[workspaceLocation].globals,
-    state.workspaces[workspaceLocation].context.variant,
-    state.workspaces[workspaceLocation].context.languageOptions
-  ]);
+  const {
+    context: { chapter, externalSymbols: symbols, variant, languageOptions },
+    externalLibrary: externalLibraryName,
+    globals,
+  } = yield* selectWorkspace(workspaceLocation);
 
   const library = {
     chapter,

src/commons/sagas/__tests__/WorkspaceSaga.test.ts

@@ -130,7 +130,8 @@ describe('EVAL_EDITOR', () => {
         name: ExternalLibraryName.NONE,
         symbols: context.externalSymbols
       },
-      globals
+      globals,
+      languageOptions: context.languageOptions
     };
 
     const newDefaultState = generateDefaultState(workspaceLocation, {
@@ -397,7 +398,8 @@ describe('EVAL_TESTCASE', () => {
         name: ExternalLibraryName.NONE,
         symbols: context.externalSymbols
       },
-      globals
+      globals,
+      languageOptions: context.languageOptions
     };
 
     const newDefaultState = generateDefaultState(workspaceLocation, {
@@ -689,23 +691,34 @@ describe('PLAYGROUND_EXTERNAL_SELECT', () => {
         name: newExternalLibraryName,
         symbols
       },
-      globals
+      globals,
+      languageOptions: context.languageOptions
     };
 
-    return expectSaga(workspaceSaga)
-      .withState(newDefaultState)
-      .put(WorkspaceActions.changeExternalLibrary(newExternalLibraryName, workspaceLocation))
-      .put(WorkspaceActions.beginClearContext(workspaceLocation, library, true))
-      .put(WorkspaceActions.clearReplOutput(workspaceLocation))
-      .call(showSuccessMessage, `Switched to ${newExternalLibraryName} library`, 1000)
-      .dispatch({
-        type: WorkspaceActions.externalLibrarySelect.type,
-        payload: {
-          externalLibraryName: newExternalLibraryName,
-          workspaceLocation
-        }
-      })
-      .silentRun();
+    return (
+      expectSaga(workspaceSaga)
+        .withState(newDefaultState)
+        .put(WorkspaceActions.changeExternalLibrary(newExternalLibraryName, workspaceLocation))
+        // beginClearContext is asserted here but the library object can contain
+        // runtime-specific fields (like languageOptions). Match only the action
+        // shape we care about (type, workspaceLocation and shouldInitLibrary)
+        .put.like({
+          action: {
+            type: WorkspaceActions.beginClearContext.type,
+            payload: { workspaceLocation, shouldInitLibrary: true }
+          }
+        })
+        .put(WorkspaceActions.clearReplOutput(workspaceLocation))
+        .call(showSuccessMessage, `Switched to ${newExternalLibraryName} library`, 1000)
+        .dispatch({
+          type: WorkspaceActions.externalLibrarySelect.type,
+          payload: {
+            externalLibraryName: newExternalLibraryName,
+            workspaceLocation
+          }
+        })
+        .silentRun()
+    );
   });
 
   test('does not call the above when oldExternalLibraryName === newExternalLibraryName', () => {
@@ -770,7 +783,8 @@ describe('BEGIN_CLEAR_CONTEXT', () => {
         name: newExternalLibraryName,
         symbols
       },
-      globals
+      globals,
+      languageOptions: undefined
     };
 
     return expectSaga(workspaceSaga)