From 4f95326eae0b546cf7621bc99003620bca2e5e17 Mon Sep 17 00:00:00 2001
From: Nicolas Brichet <nicolas.brichet@quantstack.net>
Date: Wed, 19 Jun 2024 13:52:43 +0200
Subject: [PATCH] Fix notebook tests

---
 nbgrader/tests/ui-tests/create_assignement.spec.ts  | 8 +++++---
 nbgrader/tests/ui-tests/formgrader.spec.ts          | 3 +--
 nbgrader/tests/ui-tests/validate_assignment.spec.ts | 8 +++++---
 src/index.ts                                        | 6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/nbgrader/tests/ui-tests/create_assignement.spec.ts b/nbgrader/tests/ui-tests/create_assignement.spec.ts
index 2d603dd28..3d5341c3d 100644
--- 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
index d53f3a7cd..cd30373a3 100644
--- 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
index d4e4f5abe..84a0ddcf7 100644
--- 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
index 5b8d76785..3f500a9cb 100644
--- 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;