Update tests for notebook execution

Author: znorman-harris

apps/client-e2e/src/tests/notebooks/helpers/run-notebook-and-check-call-stack-decorations.ts

@@ -52,7 +52,7 @@ export async function RunNotebookAndCheckCallStackDecorations(
   await vscode.commands.executeCommand(VSCODE_COMMANDS.NOTEBOOK_RUN_ALL);
 
   // make sure launched
-  expect(controller.isStarted()).toBeTruthy();
+  expect(controller.isStarted(nb)).toBeTruthy();
 
   // short pause based on the number of cells we have
   // sometimes the rendering takes too long to register (like complex maps)

apps/client-e2e/src/tests/notebooks/helpers/run-notebook-and-compare-cells.ts

@@ -49,7 +49,7 @@ export async function RunNotebookAndCompareCells(
   await vscode.commands.executeCommand(VSCODE_COMMANDS.NOTEBOOK_RUN_ALL);
 
   // make sure launched
-  expect(controller.isStarted()).toBeTruthy();
+  expect(controller.isStarted(nb)).toBeTruthy();
 
   // short pause based on the number of cells we have
   // sometimes the rendering takes too long to register (like complex maps)

apps/client-e2e/src/tests/notebooks/notebook-reset.ts

@@ -39,7 +39,7 @@ export const RunNotebookReset: RunnerFunction = async (init) => {
   await vscode.commands.executeCommand(VSCODE_COMMANDS.NOTEBOOK_RUN_ALL);
 
   // make sure launched
-  expect(init.notebooks.controller.isStarted()).toBeTruthy();
+  expect(init.notebooks.controller.isStarted(nb)).toBeTruthy();
 
   // trigger a run
   vscode.commands.executeCommand(VSCODE_COMMANDS.NOTEBOOK_RUN_ALL);
@@ -54,7 +54,7 @@ export const RunNotebookReset: RunnerFunction = async (init) => {
   await Sleep(100);
 
   // make sure stopped
-  expect(init.notebooks.controller.isStarted()).toBeTruthy();
+  expect(init.notebooks.controller.isStarted(nb)).toBeTruthy();
 
   // compare state
   CompareCellOutputs(nb, CELL_OUTPUT);

apps/client-e2e/src/tests/notebooks/notebook-stop.ts

@@ -39,7 +39,7 @@ export const RunNotebookStop: RunnerFunction = async (init) => {
   await vscode.commands.executeCommand(VSCODE_COMMANDS.NOTEBOOK_RUN_ALL);
 
   // make sure launched
-  expect(init.notebooks.controller.isStarted()).toBeTruthy();
+  expect(init.notebooks.controller.isStarted(nb)).toBeTruthy();
 
   // trigger a run
   vscode.commands.executeCommand(VSCODE_COMMANDS.NOTEBOOK_RUN_ALL);
@@ -54,7 +54,7 @@ export const RunNotebookStop: RunnerFunction = async (init) => {
   await Sleep(100);
 
   // make sure stopped
-  expect(init.notebooks.controller.isStarted()).toBeFalsy();
+  expect(init.notebooks.controller.isStarted(nb)).toBeFalsy();
 
   // compare state
   CompareCellOutputs(nb, CELL_OUTPUT);

apps/client-e2e/src/tests/notebooks/run-unsaved-notebook.ts

@@ -27,14 +27,6 @@ export const RunUnsavedNotebook: RunnerFunction = async (init) => {
   /** Get reference to the notebook controller */
   const controller = init.notebooks.controller;
 
-  // start IDL if it hasnt yet
-  if (!controller.isStarted()) {
-    await controller.launchIDL('Launching IDL');
-  }
-
-  // make sure launched
-  expect(controller.isStarted()).toBeTruthy();
-
   // make new notebook
   await vscode.commands.executeCommand(
     IDL_COMMANDS.NOTEBOOKS.NEW_NOTEBOOK,
@@ -53,6 +45,14 @@ export const RunUnsavedNotebook: RunnerFunction = async (init) => {
   /** Get reference to the current notebook */
   const nb = editor.notebook;
 
+  // start IDL if it hasnt yet
+  if (!controller.isStarted(nb)) {
+    await controller.launchIDL(nb, 'Launching IDL');
+  }
+
+  // make sure launched
+  expect(controller.isStarted(nb)).toBeTruthy();
+
   // update text
   const cells = nb.getCells();
 

apps/client-e2e/src/tests/notebooks/verify-quiet-notebook-setting.ts

@@ -1,6 +1,7 @@
 import { GetExtensionPath, IDL_COMMANDS, Sleep } from '@idl/shared';
 import { GetWorkspaceConfig, IIDLWorkspaceConfig } from '@idl/vscode/config';
 import { IDL_EXTENSION_CONFIG_KEYS } from '@idl/vscode/extension-config';
+import { OpenNotebookInVSCode } from '@idl/vscode/shared';
 import expect from 'expect';
 import * as vscode from 'vscode';
 
@@ -34,6 +35,9 @@ export const NOT_QUIET_OUTPUT: ICompareCellOutputs[] = [
  * Function that runs basic tests for ENVI message listeners
  */
 export const VerifyQuietNotebookSetting: RunnerFunction = async (init) => {
+  const quietFile = GetExtensionPath(
+    'idl/test/client-e2e/notebooks/quiet-preference.idlnb'
+  );
   // get the current workspace config
   const config = GetWorkspaceConfig();
 
@@ -46,7 +50,7 @@ export const VerifyQuietNotebookSetting: RunnerFunction = async (init) => {
 
   // run in quiet mode
   await RunNotebookAndCompareCells(
-    GetExtensionPath('idl/test/client-e2e/notebooks/quiet-preference.idlnb'),
+    quietFile,
     QUIET_OUTPUT,
     init.notebooks.controller
   );
@@ -64,12 +68,9 @@ export const VerifyQuietNotebookSetting: RunnerFunction = async (init) => {
   // short pause
   await Sleep(100);
 
-  // make sure stopped
-  expect(init.notebooks.controller.isStarted()).toBeTruthy();
-
   // run in quiet mode
   await RunNotebookAndCompareCells(
-    GetExtensionPath('idl/test/client-e2e/notebooks/quiet-preference.idlnb'),
+    quietFile,
     NOT_QUIET_OUTPUT,
     init.notebooks.controller
   );
@@ -87,6 +88,9 @@ export const VerifyQuietNotebookSetting: RunnerFunction = async (init) => {
   // short pause
   await Sleep(100);
 
+  // open NB
+  const nb = await OpenNotebookInVSCode(quietFile);
+
   // make sure stopped
-  expect(init.notebooks.controller.isStarted()).toBeFalsy();
+  expect(init.notebooks.controller.isStarted(nb)).toBeFalsy();
 };

libs/vscode/notebooks/src/lib/controller/idl-notebook-controller.class.ts

@@ -143,7 +143,11 @@ export class IDLNotebookController {
     this.knownNotebooks[_notebook.uri.toString()] = _notebook;
 
     /** Have manager run notebook cell */
-    this.getNotebookManager(_notebook)._execute(cells, _notebook, _controller);
+    await this.getNotebookManager(_notebook)._execute(
+      cells,
+      _notebook,
+      _controller
+    );
   }
 
   /**