Fix notebook tests

jupyter · Jun 20, 2024 · 4f95326 · 4f95326
1 parent 0230bbf
commit 4f95326
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/nbgrader/tests/ui-tests/create_assignement.spec.ts b/nbgrader/tests/ui-tests/create_assignement.spec.ts
@@ -65,9 +65,11 @@ test.beforeEach(async ({ request, tmpPath }) => {
 test.afterEach(async ({ request, page, tmpPath }) => {
   if (request === undefined) throw new Error("Request is undefined.");
 
-  // Close opened notebook.
-  while (await page.notebook.isAnyActive()) {
-    await page.notebook.close();
+  if (!notebookTest) {
+    // Close opened notebook.
+    while (await page.notebook.isAnyActive()) {
+      await page.notebook.close();
+    }
   }
 
   const contents = galata.newContentsHelper(request, page);

diff --git a/nbgrader/tests/ui-tests/formgrader.spec.ts b/nbgrader/tests/ui-tests/formgrader.spec.ts
@@ -21,7 +21,7 @@ const tempPath = 'nbgrader-formgrader-test';
 
 let test = jupyterLabTest;
 let mainPanelId = '#jp-main-dock-panel';
-let menuPanelId = '#jp-menu-panel';
+let menuPanelId = '#jp-MainMenu';
 let mainPanelTabCount = 1;
 
 const baseTestUse = {
@@ -41,7 +41,6 @@ if (isNotebook) {
     autoGoto: false
   });
   mainPanelId = '#main-panel';
-  menuPanelId = '#menu-panel';
   mainPanelTabCount = 2;
 }
 else {

diff --git a/nbgrader/tests/ui-tests/validate_assignment.spec.ts b/nbgrader/tests/ui-tests/validate_assignment.spec.ts
@@ -79,9 +79,11 @@ test.beforeEach(async ({ request, tmpPath }) => {
 test.afterEach(async ({ request, page, tmpPath }) => {
   if (request === undefined) throw new Error("Request is undefined.");
 
-  // Close opened notebook.
-  while (await page.notebook.isAnyActive()) {
-    await page.notebook.close();
+  if (!notebookTest) {
+    // Close opened notebook.
+    while (await page.notebook.isAnyActive()) {
+      await page.notebook.close();
+    }
   }
 
   const contents = galata.newContentsHelper(request, page);

diff --git a/src/index.ts b/src/index.ts
@@ -47,9 +47,9 @@ const availableExtensionsManager: JupyterFrontEndPlugin<void> = {
   activate: (
     app: JupyterFrontEnd,
     mainMenu: IMainMenu,
-    palette: ICommandPalette,
-    labShell: ILabShell,
-    notebookShell: INotebookShell
+    palette: ICommandPalette | null,
+    labShell: ILabShell | null,
+    notebookShell: INotebookShell | null
   ) => {
 
     let mainExtensions = false;