From 0e1cc5dc303117dc3e4a62fcd13191b8a8479644 Mon Sep 17 00:00:00 2001
From: Jesse Mazzella <ozyx@users.noreply.github.com>
Date: Thu, 14 Jul 2022 17:16:50 -0700
Subject: [PATCH] Upgrade to `karma-jasmine` 5.1.0 and fix unit tests (#5503)

---
 e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js | 1 -
 package.json                                              | 2 +-
 src/plugins/LADTable/pluginSpec.js                        | 4 +---
 src/plugins/newFolderAction/pluginSpec.js                 | 6 +++++-
 src/plugins/remoteClock/RemoteClockSpec.js                | 6 ++----
 src/plugins/viewDatumAction/pluginSpec.js                 | 4 +++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js b/e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js
index 56ce843921..18c4653d85 100644
--- a/e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js
+++ b/e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js
@@ -58,7 +58,6 @@ test.describe('Restricted Notebook', () => {
             page.locator('text=OK').click(),
             page.waitForSelector('.c-message-banner__message')
         ]);
-        await page.locator('.c-message-banner__close-button').click();
 
         // has been deleted
         expect(await restrictedNotebookTreeObject.count()).toEqual(0);
diff --git a/package.json b/package.json
index d0de1d3cf7..2af57ed70e 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "karma-coverage": "2.2.0",
     "karma-coverage-istanbul-reporter": "3.0.3",
     "karma-firefox-launcher": "2.1.2",
-    "karma-jasmine": "4.0.1",
+    "karma-jasmine": "5.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-sourcemap-loader": "0.3.8",
     "karma-spec-reporter": "0.0.34",
diff --git a/src/plugins/LADTable/pluginSpec.js b/src/plugins/LADTable/pluginSpec.js
index 33985983e4..b03c99afc3 100644
--- a/src/plugins/LADTable/pluginSpec.js
+++ b/src/plugins/LADTable/pluginSpec.js
@@ -155,7 +155,7 @@ describe("The LAD Table", () => {
         // add another telemetry object as composition in lad table to test multi rows
         mockObj.ladTable.composition.push(anotherTelemetryObj.identifier);
 
-        beforeEach(async (done) => {
+        beforeEach(async () => {
             let telemetryRequestResolve;
             let telemetryObjectResolve;
             let anotherTelemetryObjectResolve;
@@ -204,8 +204,6 @@ describe("The LAD Table", () => {
 
             await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]);
             await Vue.nextTick();
-
-            done();
         });
 
         it("should show one row per object in the composition", () => {
diff --git a/src/plugins/newFolderAction/pluginSpec.js b/src/plugins/newFolderAction/pluginSpec.js
index 1880b11d5a..084df1ed97 100644
--- a/src/plugins/newFolderAction/pluginSpec.js
+++ b/src/plugins/newFolderAction/pluginSpec.js
@@ -49,6 +49,7 @@ describe("the plugin", () => {
         let parentObject;
         let parentObjectPath;
         let changedParentObject;
+        let unobserve;
         beforeEach((done) => {
             parentObject = {
                 name: 'mock folder',
@@ -73,7 +74,7 @@ describe("the plugin", () => {
                 });
             });
 
-            openmct.objects.observe(parentObject, '*', (newObject) => {
+            unobserve = openmct.objects.observe(parentObject, '*', (newObject) => {
                 changedParentObject = newObject;
 
                 done();
@@ -81,6 +82,9 @@ describe("the plugin", () => {
 
             newFolderAction.invoke(parentObjectPath);
         });
+        afterEach(() => {
+            unobserve();
+        });
 
         it('creates a new folder object', () => {
             expect(openmct.objects.save).toHaveBeenCalled();
diff --git a/src/plugins/remoteClock/RemoteClockSpec.js b/src/plugins/remoteClock/RemoteClockSpec.js
index 63aa03791c..0c28d41848 100644
--- a/src/plugins/remoteClock/RemoteClockSpec.js
+++ b/src/plugins/remoteClock/RemoteClockSpec.js
@@ -71,7 +71,7 @@ describe("the RemoteClock plugin", () => {
             parse: (datum) => datum.key
         };
 
-        beforeEach((done) => {
+        beforeEach(async () => {
             openmct.install(openmct.plugins.RemoteClock(TIME_TELEMETRY_ID));
 
             let clocks = openmct.time.getAllClocks();
@@ -113,9 +113,7 @@ describe("the RemoteClock plugin", () => {
                 end: OFFSET_END
             });
 
-            Promise.all([objectPromiseResolve, requestPromise])
-                .then(done)
-                .catch(done);
+            await Promise.all([objectPromiseResolve, requestPromise]);
         });
 
         it('is available and sets up initial values and listeners', () => {
diff --git a/src/plugins/viewDatumAction/pluginSpec.js b/src/plugins/viewDatumAction/pluginSpec.js
index 8133e8413f..954172f9f2 100644
--- a/src/plugins/viewDatumAction/pluginSpec.js
+++ b/src/plugins/viewDatumAction/pluginSpec.js
@@ -78,13 +78,15 @@ describe("the plugin", () => {
 
     describe('when invoked', () => {
 
-        beforeEach((done) => {
+        beforeEach(() => {
             openmct.overlays.overlay = function (options) {};
 
             spyOn(openmct.overlays, 'overlay');
 
             viewDatumAction.invoke(mockObjectPath, mockView);
+        });
 
+        it('creates an overlay', () => {
             expect(openmct.overlays.overlay).toHaveBeenCalled();
         });
     });