form no work

.circleci/config.yml

@@ -5,20 +5,20 @@ executors:
       - image: mcr.microsoft.com/playwright:v1.39.0-focal
     environment:
       NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
-      PERCY_POSTINSTALL_BROWSER: "true" # Needed to store the percy browser in cache deps
-      PERCY_LOGLEVEL: "debug" # Enable DEBUG level logging for Percy (Issue: https://github.com/nasa/openmct/issues/5742)
+      PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps
+      PERCY_LOGLEVEL: 'debug' # Enable DEBUG level logging for Percy (Issue: https://github.com/nasa/openmct/issues/5742)
   ubuntu:
     machine:
       image: ubuntu-2204:current
       docker_layer_caching: true
 parameters:
   BUST_CACHE:
-    description: "Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!"
+    description: 'Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!'
     default: false
     type: boolean
 commands:
   build_and_install:
-    description: "All steps used to build and install. Will use cache if found"
+    description: 'All steps used to build and install. Will use cache if found'
     parameters:
       node-version:
         type: string
@@ -30,7 +30,7 @@ commands:
           node-version: << parameters.node-version >>
       - run: npm install --no-audit --progress=false
   restore_cache_cmd:
-    description: "Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache"
+    description: 'Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache'
     parameters:
       node-version:
         type: string
@@ -42,7 +42,7 @@ commands:
             - restore_cache:
                 key: deps--{{ arch }}--{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
   save_cache_cmd:
-    description: "Custom command for saving cache."
+    description: 'Custom command for saving cache.'
     parameters:
       node-version:
         type: string
@@ -53,7 +53,7 @@ commands:
             - ~/.npm
             - node_modules
   generate_and_store_version_and_filesystem_artifacts:
-    description: "Track important packages and files"
+    description: 'Track important packages and files'
     steps:
       - run: |
           [[ $EUID -ne 0 ]] && (sudo mkdir -p /tmp/artifacts && sudo chmod 777 /tmp/artifacts) || (mkdir -p /tmp/artifacts && chmod 777 /tmp/artifacts)
@@ -64,7 +64,7 @@ commands:
       - store_artifacts:
           path: /tmp/artifacts/
   generate_e2e_code_cov_report:
-    description: "Generate e2e code coverage artifacts and publish to codecov.io. Needed to that we can ignore the exit code status of the npm run test"
+    description: 'Generate e2e code coverage artifacts and publish to codecov.io. Needed to that we can ignore the exit code status of the npm run test'
     parameters:
       suite:
         type: string
@@ -105,11 +105,7 @@ jobs:
           node-version: <<parameters.node-version>>
       - browser-tools/install-chrome:
           replace-existing: false
-      - run:
-          command: |
-            mkdir -p dist/reports/tests/
-            TESTFILES=$(circleci tests glob "src/**/*Spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test" --verbose
+      - run: npm run test
       - run: npm run cov:unit:publish
       - save_cache_cmd:
           node-version: <<parameters.node-version>>
@@ -127,20 +123,16 @@ jobs:
       suite: #stable or full
         type: string
     executor: pw-focal-development
-    parallelism: 7
+    parallelism: 6
     steps:
       - build_and_install:
           node-version: lts/hydrogen
       - when: #Only install chrome-beta when running the 'full' suite to save $$$
           condition:
-            equal: ["full", <<parameters.suite>>]
+            equal: ['full', <<parameters.suite>>]
           steps:
             - run: npx playwright install chrome-beta
-      - run:
-          command: |
-            mkdir test-results
-            TESTFILES=$(circleci tests glob "e2e/**/*.spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test:e2e:<<parameters.suite>>" --verbose --split-by=timings
+      - run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; npm run test:e2e:<<parameters.suite>> -- --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
       - when:
           condition:
             equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
@@ -160,31 +152,6 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  e2e-mobile:
-    executor: pw-focal-development
-    steps:
-      - build_and_install:
-          node-version: lts/hydrogen
-      - run: npm run test:e2e:mobile
-      - when:
-          condition:
-            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
-          steps:
-            - generate_e2e_code_cov_report:
-                suite: full
-      - store_test_results:
-          path: test-results/results.xml
-      - store_artifacts:
-          path: test-results
-      - store_artifacts:
-          path: coverage
-      - store_artifacts:
-          path: html-test-results
-      - when:
-          condition:
-            equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
-          steps:
-            - generate_and_store_version_and_filesystem_artifacts
   e2e-couchdb:
     executor: ubuntu
     steps:
@@ -272,7 +239,6 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-
 workflows:
   overall-circleci-commit-status: #These jobs run on every commit
     jobs:
@@ -285,9 +251,10 @@ workflows:
       - e2e-test:
           name: e2e-stable
           suite: stable
-      - e2e-mobile
+      - mem-test
+      - perf-test
       - visual-a11y-tests:
-          name: visual-a11y-test-ci
+          name: visual-test-ci
           suite: ci
 
   the-nightly: #These jobs do not run on PRs, but against master at night
@@ -303,16 +270,15 @@ workflows:
       - e2e-test:
           name: e2e-full-nightly
           suite: full
-      - e2e-mobile
-      - perf-test
       - mem-test
+      - perf-test
       - visual-a11y-tests:
-          name: visual-a11y-test-nightly
+          name: visual-test-nightly
           suite: full
       - e2e-couchdb
     triggers:
       - schedule:
-          cron: "0 0 * * *"
+          cron: '0 0 * * *'
           filters:
             branches:
               only:

.cspell.json

@@ -43,6 +43,7 @@
     "sharded",
     "perfromance",
     "MMOC",
+    "deploysentinel",
     "codegen",
     "Unfortuantely",
     "viewports",
@@ -490,16 +491,9 @@
     "oger",
     "lcovonly",
     "gcov",
-    "WCAG",
-    "stackedplot",
-    "Andale",
-    "unnormalized",
-    "checksnapshots",
-    "specced",
-    "composables",
-    "countup"
+    "WCAG"
   ],
-  "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US", "en-gb", "misc"],
+  "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US"],
   "ignorePaths": [
     "package.json",
     "dist/**",

.git-blame-ignore-revs

@@ -4,10 +4,6 @@
 # Requires Git > 2.23
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
-# vue-eslint update 2019
-14a0f84c1bcd56886d7c9e4e6afa8f7d292734e5
-# eslint changes 2022
-d80b6923541704ab925abf0047cbbc58735c27e2
 # Copyright year update 2022
 4a9744e916d24122a81092f6b7950054048ba860
 # Copyright year update 2023

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,7 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 
 * [ ] Have you followed the guidelines in our [Contributing document](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md)?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/openmct/pulls) for the same update/change?
-* [ ] Is this a notable change that will require a special callout in the release notes [Notable Change](../docs/src/process/release.md) ? For example, will this break compatibility with existing APIs or projects which source these plugins?
+* [ ] Is this change backwards compatible? For example, developers won't need to change how they are calling the API or how they've extended core plugins such as Tables or Plots.
 
 ### Author Checklist
 

.github/release.yml

@@ -1,8 +1,5 @@
 changelog:
   categories:
-    - title: 💥 Notable Changes
-      labels:
-        - notable_change
     - title: 🏕 Features
       labels:
         - type:feature
@@ -23,4 +20,4 @@ changelog:
         - dependencies
     - title: 🐛 Bug Fixes
       labels:
-        - "*"
+        - '*'

.github/workflows/e2e-couchdb.yml

@@ -47,8 +47,9 @@ jobs:
           bash src/plugins/persistence/couch/setup-couchdb.sh
           bash src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
 
-      - name: Run CouchDB Tests
+      - name: Run CouchDB Tests and publish to deploysentinel
         env:
+          DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
           COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha }}
         run: npm run test:e2e:couchdb
 

.github/workflows/e2e-flakefinder.yml

@@ -1,61 +0,0 @@
-name: 'pr:e2e:flakefinder'
-
-on:
-  push:
-    branches: master
-  workflow_dispatch:
-  pull_request:
-    types:
-      - labeled
-      - opened
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  e2e-flakefinder:
-    if: contains(github.event.pull_request.labels.*.name, 'pr:e2e:flakefinder') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event.action == 'opened'
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/hydrogen'
-
-      - name: Cache NPM dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - run: npx playwright@1.39.0 install
-      - run: npm install --cache ~/.npm --no-audit --progress=false
-
-      - name: Run E2E Tests (Repeated 10 Times)
-        run: npm run test:e2e:stable -- --retries=0 --repeat-each=10 --max-failures=50
-
-      - name: Archive test results
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          path: test-results
-
-      - name: Remove pr:e2e:flakefinder label (if present)
-        if: always()
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { owner, repo, number } = context.issue;
-            const labelToRemove = 'pr:e2e:flakefinder';
-            try {
-                await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: number,
-                name: labelToRemove
-                });
-            } catch (error) {
-                core.warning(`Failed to remove ' + labelToRemove + ' label: ${error.message}`);
-            }

.github/workflows/e2e-perf.yml

@@ -1,58 +0,0 @@
-name: 'e2e-perf'
-on:
-  push:
-    branches: master
-  workflow_dispatch:
-  pull_request:
-    types:
-      - labeled
-      - opened
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  e2e-full:
-    if: contains(github.event.pull_request.labels.*.name, 'pr:e2e:perf') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/hydrogen'
-
-      - name: Cache NPM dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - run: npx playwright@1.39.0 install
-      - run: npm install --cache ~/.npm --no-audit --progress=false
-      - run: npm run test:perf:localhost
-      - run: npm run test:perf:contract
-      - run: npm run test:perf:memory
-      - name: Archive test results
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          path: test-results
-
-      - name: Remove pr:e2e:perf label (if present)
-        if: always()
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { owner, repo, number } = context.issue;
-            const labelToRemove = 'pr:e2e:perf';
-            try {
-              await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: number,
-                name: labelToRemove
-              });
-            } catch (error) {
-              core.warning(`Failed to remove ' + labelToRemove + ' label: ${error.message}`);
-            }

.gitignore

@@ -15,9 +15,6 @@
 *.idea
 *.iml
 
-# VSCode
-.vscode/settings.json
-
 # Build output
 target
 dist

.vscode/extensions.json

@@ -1,14 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-  // List of extensions which should be recommended for users of this workspace.
-  "recommendations": [
-    "Vue.volar",
-    "Vue.vscode-typescript-vue-plugin",
-    "dbaeumer.vscode-eslint",
-    "rvest.vs-code-prettier-eslint"
-  ],
-  // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-  "unwantedRecommendations": ["octref.vetur"]
-}

.webpack/webpack.common.js

@@ -1,3 +1,5 @@
+/* global __dirname module */
+
 /*
 This is the OpenMCT common webpack file. It is imported by the other three webpack configurations:
  - webpack.prod.js - the production configuration for OpenMCT (default)
@@ -6,28 +8,27 @@ This is the OpenMCT common webpack file. It is imported by the other three webpa
 There are separate npm scripts to use these configurations, though simply running `npm install`
 will use the default production configuration.
 */
-import { execSync } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
+const path = require('path');
+const packageDefinition = require('../package.json');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const webpack = require('webpack');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import { VueLoaderPlugin } from 'vue-loader';
-import webpack from 'webpack';
+const { VueLoaderPlugin } = require('vue-loader');
 let gitRevision = 'error-retrieving-revision';
 let gitBranch = 'error-retrieving-branch';
 
-const packageDefinition = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
-
 try {
-  gitRevision = execSync('git rev-parse HEAD').toString().trim();
-  gitBranch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+  gitRevision = require('child_process').execSync('git rev-parse HEAD').toString().trim();
+  gitBranch = require('child_process')
+    .execSync('git rev-parse --abbrev-ref HEAD')
+    .toString()
+    .trim();
 } catch (err) {
   console.warn(err);
 }
 
-const projectRootDir = fileURLToPath(new URL('../', import.meta.url));
+const projectRootDir = path.resolve(__dirname, '..');
 
 /** @type {import('webpack').Configuration} */
 const config = {
@@ -55,7 +56,6 @@ const config = {
     filename: '[name].js',
     path: path.resolve(projectRootDir, 'dist'),
     library: 'openmct',
-    libraryExport: 'default',
     libraryTarget: 'umd',
     publicPath: '',
     hashFunction: 'xxhash64',
@@ -65,6 +65,7 @@ const config = {
     alias: {
       '@': path.join(projectRootDir, 'src'),
       legacyRegistry: path.join(projectRootDir, 'src/legacyRegistry'),
+      saveAs: 'file-saver/src/FileSaver.js',
       csv: 'comma-separated-values',
       EventEmitter: 'eventemitter3',
       bourbon: 'bourbon.scss',
@@ -182,4 +183,4 @@ const config = {
   }
 };
 
-export default config;
+module.exports = config;

.webpack/webpack.coverage.js

@@ -1,10 +1,12 @@
+/* global module */
+
 /*
 This file extends the webpack.dev.js config to add babel istanbul coverage.
 OpenMCT Continuous Integration servers use this configuration to add code coverage
 information to pull requests.
 */
 
-import config from './webpack.dev.js';
+const config = require('./webpack.dev');
 // eslint-disable-next-line no-undef
 const CI = process.env.CI === 'true';
 
@@ -32,4 +34,4 @@ config.module.rules.push({
   }
 });
 
-export default config;
+module.exports = config;

.webpack/webpack.dev.js

@@ -1,16 +1,18 @@
+/* global __dirname module */
+
 /*
 This configuration should be used for development purposes. It contains full source map, a
 devServer (which be invoked using by `npm start`), and a non-minified Vue.js distribution.
 If OpenMCT is to be used for a production server, use webpack.prod.js instead.
 */
-import path from 'path';
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-import { fileURLToPath } from 'node:url';
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 
-import common from './webpack.common.js';
+const common = require('./webpack.common');
+const projectRootDir = path.resolve(__dirname, '..');
 
-export default merge(common, {
+module.exports = merge(common, {
   mode: 'development',
   watchOptions: {
     // Since we use require.context, webpack is watching the entire directory.
@@ -40,7 +42,7 @@ export default merge(common, {
     },
     watchFiles: ['**/*.css'],
     static: {
-      directory: fileURLToPath(new URL('../dist', import.meta.url)),
+      directory: path.join(__dirname, '..', '/dist'),
       publicPath: '/dist',
       watch: false
     }

.webpack/webpack.prod.js

@@ -1,14 +1,17 @@
+/* global __dirname module */
+
 /*
 This configuration should be used for production installs.
 It is the default webpack configuration.
 */
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
+const common = require('./webpack.common');
+const projectRootDir = path.resolve(__dirname, '..');
 
-import common from './webpack.common.js';
-
-export default merge(common, {
+module.exports = merge(common, {
   mode: 'production',
   plugins: [
     new webpack.DefinePlugin({

LICENSE.md

@@ -1,6 +1,6 @@
 # Open MCT License
 
-Open MCT, Copyright (c) 2014-2024, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, Copyright (c) 2014-2023, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
 
 Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
 

TESTING.md

@@ -85,8 +85,9 @@ There are a few reasons that your GitHub PR could be failing beyond simple faile
 * Not all required checks are run per commit. You may need to manually trigger addition GitHub checks with a `pr:<label>` label added to your PR.
 
 ### Flaky tests
-
-(CircleCI's test insights feature)[https://circleci.com/blog/introducing-test-insights-with-flaky-test-detection/] collects historical data about the individual test results for both unit and e2e tests. Note: only a 14 day window of flake is available.
+There are two ways to know if a test on your branch is historically flaky: 
+1. `deploysentinel`'s PR comment bot to give an accurate and historical view of e2e flakiness. Check your PR for a view of the test failures and flakes (with link to the failing test). Note: only a 7 day window of flake is available.
+2. (CircleCI's test insights feature)[https://circleci.com/blog/introducing-test-insights-with-flaky-test-detection/] collects historical data about the individual test results for both unit and e2e tests. Note: only a 14 day window of flake is available.
 
 ### Local=Pass and CI=Fail
 Although rare, it is possible that your test can pass locally but fail in CI.

build-docs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2024, United States Government
+#* Open MCT, Copyright (c) 2014-2023, United States Government
 #* as represented by the Administrator of the National Aeronautics and Space
 #* Administration. All rights reserved.
 #*

copyright-notice.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2024, United States Government
+ Open MCT, Copyright (c) 2014-2023, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

copyright-notice.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

docs/src/process/release.md

@@ -1,126 +0,0 @@
-
-# Release of NASA Open MCT NPM Package
-
-This document outlines the process and key considerations for releasing a new version of the NASA Open MCT project as an NPM (Node Package Manager) package.
-
-## FAQ
-
-1. When do we publish a new version of Open MCT?
-    - At the end of a working sprint (typically) after all blocking issues have been resolved.
-2. Where do we publish?
-    - [NPM](https://www.npmjs.com/package/openmct)
-    - [Github Releases](https://github.com/nasa/openmct/releases)
-2. What do we publish?
-    - What constitutes a "stable" release?
-        - TODO
-    - What constitutes a "latest" release?
-        - The most recently published release.
-    - What constitutes a "nightly" release?
-        - TODO
-4. What necessitates a patch release?
-    - 
-
-## 1. Pre-requisites
-
-Before releasing a new version of Open MCT, ensure that all dependencies are updated, and
-comprehensive testing is performed.
-
-## 2. Versioning
-
-Open MCT follows [Semantic Versioning 2.0.0 (SemVer)](https://semver.org) that consists of three 
-major components: `MAJOR.MINOR.PATCH` (i.e. `1.2.3`).
-
-Major releases are necessitated by fundamental framework changes that are expected to be incompatible
-with previous releases.
-
-Minor releases are necessitated by non-backwards-compatible application, API changes, or new
-features or enhancements.
-
-Patch releases are created for backporting fixes to blocking bugs that were discovered _after_
-the release of a major or minor version. They are not to introduce new features, enhancements, or
-dependency changes.
-
-## 3. Changelog Maintenance
-
-Changelogs can be found in the GitHub releases section of the repository and are auto-generated
-using [GitHub's feature](https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes).
-
-## 4. Pull Request Labeling
-
-Generation of release notes is automated by the use of labels on pull requests. The following
-labels are used to categorize pull requests:
-
-### `type:bug`
-
-Pull requests are to be labeled with `type:bug` if they contain changes that intend to fix a bug.
-
-### `type:enhancement`
-
-Pull requests are to be labeled with `type:enhancement` if they contain changes that intend to
-enhance existing functionality of Open MCT.
-
-### `type:feature`
-
-Pull requests are to be labeled with `type:feature` if they contain changes that intend to introduce
-new functionality to Open MCT.
-
-### `type:maintenance`
-
-Pull requests are to be labeled with `type:maintenance` if they contain changes that introduce
-new tests, documentation, or other maintenance-related changes.
-
-### `performance`
-
-Pull requests are to be labeled with `performance` if they contain changes that are intended to
-improve the performance of Open MCT.
-
-### `notable_change`
-
-Pull requests are to be labeled with `notable_change` if they contain changes that fit any of the 
-following criteria:
-
-- **Breaking Change**
-    - Highlights the integration of changes that are suspected to break, or without a doubt will
-    break, backwards compatibility. These should signal to users the upgrade might be seamless only
-    if dependency and integration factors are properly managed, if not, one should expect to manage
-    atypical technical snags.
-- **API Change**
-    - Signifies any change to the Open MCT API such as the addition of new methods, or the 
-    modification or deprecation of existing methods. API changes may or may not constitute a
-    breaking change.
-- **Default Behavior Change**
-    - Any change to the default behavior of Open MCT, such as the default configuration of a plugin,
-    or the default behavior of a user interface component or feature (i.e.: autoscale being enabled
-    by default on plots). 
-
-## 5. Community & Contributions
-
-Open MCT is an open-source project and contributions are welcome. As such, it is important to
-acknowledge the contributions of the community and contributors. Pull requests by contributors
-will be labeled with `source:community` to signify that the contribution was made by a member of
-the community.
-
-## 6. Release Process
-
-Currently, the release process is manual and requires the following steps:
-
-1. Clone a fresh copy of the repository. 
-    - `git clone git@github.com:nasa/openmct.git`
-2. Check out the appropriate release branch.
-    - `git checkout release/1.2.3`
-3. Ensure that the `package.json` file is updated with the correct version number and does not
-contain the `-next` suffix (which implies a pre-release).
-4. Create a tag for the release if it does not already exist.
-    - `git tag v1.2.3`
-5. Push the tag to the repository.
-    - `git push origin v1.2.3`
-6. Run `npm install` to install dependencies.
-7. Publish the release to NPM (You will need to be logged in to an NPM account with the appropriate permissions).
-    - `npm publish`
-8. Create a release on GitHub.
-    - Navigate to the Releases page on the Open MCT repository.
-    - Click [draft a new release.](https://github.com/nasa/openmct/releases/new)
-    - Choose the tag that was just created for the release.
-    - For "Previous tag", choose the tag that was most recently released.
-    - Click "Generate release notes" to auto-generate release notes.
-    - Click "Publish release" to publish the release.

e2e/.eslintrc.cjs

@@ -1,15 +0,0 @@
-/* eslint-disable no-undef */
-module.exports = {
-  extends: ['plugin:playwright/playwright-test'],
-  rules: {
-    'playwright/max-nested-describe': ['error', { max: 1 }]
-  },
-  overrides: [
-    {
-      files: ['tests/visual/*.spec.js'],
-      rules: {
-        'playwright/no-wait-for-timeout': 'off'
-      }
-    }
-  ]
-};

e2e/.eslintrc.js

@@ -0,0 +1,18 @@
+/* eslint-disable no-undef */
+module.exports = {
+  extends: ['plugin:playwright/playwright-test'],
+  rules: {
+    'playwright/max-nested-describe': ['error', { max: 1 }],
+    'playwright/no-nth-methods': 'error',
+    'playwright/no-raw-locators': 'error'
+  },
+  overrides: [
+    {
+      files: ['tests/visual-a11y/*.spec.js'],
+      rules: {
+        'playwright/no-wait-for-timeout': 'off',
+        'playwright/expect-expect': 'off'
+      }
+    }
+  ]
+};

e2e/.percy.ci.yml

@@ -25,9 +25,4 @@ snapshot:
     /* Time Conductor Start Time */
     .c-compact-tc__setting-value{
       opacity: 0 !important;
-    }
-    /* Chart Area for Plots */
-    .gl-plot-chart-area{
-      opacity: 0 !important;
-    }
-   
+    }

e2e/.percy.nightly.yml

@@ -25,8 +25,4 @@ snapshot:
     /* Time Conductor Start Time */
     .c-compact-tc__setting-value{
       opacity: 0 !important;
-    }
-    /* Chart Area for Plots */
-    .gl-plot-chart-area{
-      opacity: 0 !important;
     }

e2e/README.md

@@ -109,7 +109,7 @@ For those interested in the mechanics of snapshot testing with Playwright, you c
 // from our package.json or circleCI configuration file
 docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
 npm install
-npm run test:e2e:checksnapshots
+npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
 ```
 
 ### Updating Snapshots
@@ -134,12 +134,6 @@ npm install
 npm run test:e2e:updatesnapshots
 ```
 
-Once that's done, you'll need to run the following to verify that the changes do not cause more problems:
-
-```sh
-npm run test:e2e:checksnapshots
-```
-
 ## Automated Accessibility (a11y) Testing
 
 Open MCT incorporates accessibility testing through two primary methods to ensure its compliance with accessibility standards:
@@ -229,7 +223,7 @@ Current list of test tags:
 
 |Test Tag|Description|
 |:-:|-|
-|`@mobile` | Test case or test suite is compatible with Playwright's iPad support and Open MCT's read-only mobile view (i.e. no create button).|
+|`@ipad` | Test case or test suite is compatible with Playwright's iPad support and Open MCT's read-only mobile view (i.e. no create button).|
 |`@a11y` | Test case or test suite to execute playwright-axe accessibility checks and generate a11y reports.|
 |`@gds` | Denotes a GDS Test Case used in the VIPER Mission.|
 |`@addInit` | Initializes the browser with an injected and artificial state. Useful for loading non-default plugins. Likely will not work outside of `npm start`.|
@@ -329,15 +323,9 @@ In terms of operating system testing, we're only limited by what the CI provider
 
 #### **Mobile**
 
-We have a Mission-need to support iPad and mobile devices. To run our test suites with mobile devices, please see our `playwright-mobile.config.js` projects.
+We have the Mission-need to support iPad. To run our iPad suite, please see our `playwright-*.config.js` with the 'iPad' project.
 
-In general, our test suite is not designed to run against mobile devices as the mobile experience is a focused version of the application. Core functionality is missing (chiefly the 'Create' button). To bypass the object creation, we leverage the `storageState` properties for starting the mobile tests with localstorage.
-
-For now, the mobile tests will exist in the /tests/mobile/ suites and be executed with the
-```sh
-npm run test:e2e:mobile
-```
-command.
+In general, our test suite is not designed to run against mobile devices as the mobile experience is a focused version of the application. Core functionality is missing (chiefly the 'Create' button) and so this will likely turn into a separate suite.
 
 #### **Skipping or executing tests based on browser, os, and/os browser version:**
 
@@ -492,7 +480,7 @@ The following contains a list of tips and tricks which don't exactly fit into a
 It is possible to override the browser's clock in order to control time-based elements. Since this can cause unwanted behavior (i.e. Tree not rendering), only use this sparingly. To do this, use the `overrideClock` fixture as such:
 
 ```js
-import { test, expect } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures.js');
 
 test.describe('foo test suite', () => {
   

e2e/appActions.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -54,9 +54,9 @@
  * @property {import('../src/api/notifications/NotificationAPI').NotificationOptions} [notificationOptions] additional options
  */
 
-import { expect } from '@playwright/test';
-import { Buffer } from 'buffer';
-import { v4 as genUuid } from 'uuid';
+const Buffer = require('buffer').Buffer;
+const genUuid = require('uuid').v4;
+const { expect } = require('@playwright/test');
 
 /**
  * This common function creates a domain object with the default options. It is the preferred way of creating objects
@@ -84,12 +84,10 @@ async function createDomainObjectWithDefaults(
   await page.getByRole('button', { name: 'Create' }).click();
 
   // Click the object specified by 'type'
-  await page.click(`li[role='menuitem']:text("${type}")`);
+  await page.getByRole('menuitem', { name: new RegExp(`${type}`) }).click();
 
   // Modify the name input field of the domain object to accept 'name'
-  const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-  await nameInput.fill('');
-  await nameInput.fill(name);
+  await page.getByLabel('Title', { exact: true }).fill(name);
 
   if (page.testNotes) {
     // Fill the "Notes" section with information about the
@@ -284,7 +282,7 @@ async function navigateToObjectWithFixedTimeBounds(page, url, start, end) {
  */
 async function openObjectTreeContextMenu(page, url) {
   await page.goto(url);
-  await page.getByLabel('Show selected item in tree').click();
+  await page.click('button[title="Show selected item in tree"]');
   await page.locator('.is-navigated-object').click({
     button: 'right'
   });
@@ -644,7 +642,8 @@ async function renameObjectFromContextMenu(page, url, newName) {
   await page.click('[aria-label="Save"]');
 }
 
-export {
+// eslint-disable-next-line no-undef
+module.exports = {
   createDomainObjectWithDefaults,
   createExampleTelemetryObject,
   createNotification,
@@ -652,16 +651,16 @@ export {
   expandEntireTree,
   expandTreePaneItemByName,
   getCanvasPixels,
-  getFocusedObjectUuid,
   getHashUrlToDomainObject,
+  getFocusedObjectUuid,
   navigateToObjectWithFixedTimeBounds,
   openObjectTreeContextMenu,
-  renameObjectFromContextMenu,
-  setEndOffset,
   setFixedTimeMode,
-  setIndependentTimeConductorBounds,
   setRealTimeMode,
   setStartOffset,
+  setEndOffset,
   setTimeConductorBounds,
-  waitForPlotsToRender
+  setIndependentTimeConductorBounds,
+  waitForPlotsToRender,
+  renameObjectFromContextMenu
 };

e2e/constants.js

@@ -11,9 +11,8 @@ export const MISSION_TIME = 1732413600000; // Saturday, November 23, 2024 6:00:0
 
 /**
  * URL Constants
- * - This is the URL that the browser will be directed to when running visual tests. This URL
+ * - This is the URL that the browser will be directed to when running visual tests. This URL 
  *    - hides the tree and inspector to prevent visual noise
  *    - sets the time bounds to a fixed range
  */
-export const VISUAL_URL =
-  './#/browse/mine?tc.mode=fixed&tc.startBound=1693592063607&tc.endBound=1693593893607&tc.timeSystem=utc&view=grid&hideInspector=true&hideTree=true';
+export const VISUAL_URL = './#/browse/mine?tc.mode=fixed&tc.startBound=1693592063607&tc.endBound=1693593893607&tc.timeSystem=utc&view=grid&hideInspector=true&hideTree=true';

e2e/fixtures/avpFixtures.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -33,11 +33,10 @@
  * existing ones.
  */
 
-import AxeBuilder from '@axe-core/playwright';
-import fs from 'fs';
-import path from 'path';
-
-import { expect, test } from './pluginFixtures.js';
+const fs = require('fs');
+const path = require('path');
+const { test, expect } = require('../pluginFixtures');
+const AxeBuilder = require('@axe-core/playwright').default;
 
 // Constants for repeated values
 const TEST_RESULTS_DIR = './test-results';
@@ -57,10 +56,11 @@ const TEST_RESULTS_DIR = './test-results';
  *                                  otherwise returns null.
  */
 /* eslint-disable no-undef */
-export async function scanForA11yViolations(page, testCaseName, options = {}) {
+exports.scanForA11yViolations = async function (page, testCaseName, options = {}) {
   const builder = new AxeBuilder({ page });
   builder.withTags(['wcag2aa']);
   // https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
+  builder.disableRules(['color-contrast']);
   const accessibilityScanResults = await builder.analyze();
 
   // Assert that no violations should be present
@@ -91,6 +91,7 @@ export async function scanForA11yViolations(page, testCaseName, options = {}) {
     console.log('No accessibility violations found, no report generated.');
     return null;
   }
-}
+};
 
-export { expect, test };
+exports.expect = expect;
+exports.test = test;

e2e/fixtures/baseFixtures.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -28,12 +28,12 @@
  * GitHub issues.
  */
 
-import { expect, request, test } from '@playwright/test';
-import fs from 'fs';
-import path from 'path';
-import sinon from 'sinon';
-import { fileURLToPath } from 'url';
-import { v4 as uuid } from 'uuid';
+const base = require('@playwright/test');
+const { expect, request } = base;
+const fs = require('fs');
+const path = require('path');
+const { v4: uuid } = require('uuid');
+const sinon = require('sinon');
 
 /**
  * Takes a `ConsoleMessage` and returns a formatted string. Used to enable console log error detection.
@@ -68,7 +68,7 @@ function waitForAnimations(locator) {
  */
 const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output');
 
-const extendedTest = test.extend({
+exports.test = base.test.extend({
   /**
    * This allows the test to manipulate the browser clock. This is useful for Visual and Snapshot tests which need
    * the Time Indicator Clock to be in a specific state.
@@ -97,7 +97,7 @@ const extendedTest = test.extend({
     async ({ context, clockOptions }, use) => {
       if (clockOptions !== undefined) {
         await context.addInitScript({
-          path: fileURLToPath(new URL('../node_modules/sinon/pkg/sinon.js', import.meta.url))
+          path: path.join(__dirname, '../', './node_modules/sinon/pkg/sinon.js')
         });
         await context.addInitScript((options) => {
           window.__clock = sinon.useFakeTimers(options);
@@ -201,4 +201,6 @@ const extendedTest = test.extend({
   }
 });
 
-export { expect, request, extendedTest as test, waitForAnimations };
+exports.expect = expect;
+exports.request = request;
+exports.waitForAnimations = waitForAnimations;

e2e/fixtures/pluginFixtures.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -26,10 +26,9 @@
  * and appActions. These fixtures should be generalized across all plugins.
  */
 
-// import { createDomainObjectWithDefaults } from './appActions.js';
-import { fileURLToPath } from 'url';
-
-import { expect, request, test } from './baseFixtures.js';
+const { test, expect, request } = require('./baseFixtures');
+// const { createDomainObjectWithDefaults } = require('./appActions');
+const path = require('path');
 
 /**
  * @typedef {Object} ObjectCreateOptions
@@ -118,7 +117,7 @@ const theme = 'espresso';
  */
 const myItemsFolderName = 'My Items';
 
-const extendedTest = test.extend({
+exports.test = test.extend({
   // This should follow in the Project's configuration. Can be set to 'snow' in playwright config.js
   theme: [theme, { option: true }],
   // eslint-disable-next-line no-shadow
@@ -126,9 +125,7 @@ const extendedTest = test.extend({
     // eslint-disable-next-line playwright/no-conditional-in-test
     if (theme === 'snow') {
       //inject snow theme
-      await page.addInitScript({
-        path: fileURLToPath(new URL('./helper/useSnowTheme.js', import.meta.url))
-      });
+      await page.addInitScript({ path: path.join(__dirname, './helper', './useSnowTheme.js') });
     }
 
     // Attach info about the currently running test and its project.
@@ -145,18 +142,19 @@ const extendedTest = test.extend({
   }
 });
 
-export { expect, request, extendedTest as test };
+exports.expect = expect;
+exports.request = request;
 
 /**
  * Takes a readable stream and returns a string.
  * @param {ReadableStream} readable - the readable stream
  * @return {Promise<String>} the stringified stream
  */
-export async function streamToString(readable) {
+exports.streamToString = async function (readable) {
   let result = '';
   for await (const chunk of readable) {
     result += chunk;
   }
 
   return result;
-}
+};

e2e/helper/addInitDataVisualization.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitExampleFaultProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitExampleFaultProviderStatic.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitExampleUser.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitFaultManagementPlugin.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitNotebookWithUrls.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitOperatorStatus.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitRestrictedNotebook.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/faultUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,15 +19,14 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import { fileURLToPath } from 'url';
+/* global __dirname */
+const path = require('path');
 
 /**
  * @param {import('@playwright/test').Page} page
  */
 async function navigateToFaultManagementWithExample(page) {
-  await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitExampleFaultProvider.js', import.meta.url))
-  });
+  await page.addInitScript({ path: path.join(__dirname, './', 'addInitExampleFaultProvider.js') });
 
   await navigateToFaultItemInTree(page);
 }
@@ -37,7 +36,7 @@ async function navigateToFaultManagementWithExample(page) {
  */
 async function navigateToFaultManagementWithStaticExample(page) {
   await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitExampleFaultProviderStatic.js', import.meta.url))
+    path: path.join(__dirname, './', 'addInitExampleFaultProviderStatic.js')
   });
 
   await navigateToFaultItemInTree(page);
@@ -47,9 +46,7 @@ async function navigateToFaultManagementWithStaticExample(page) {
  * @param {import('@playwright/test').Page} page
  */
 async function navigateToFaultManagementWithoutExample(page) {
-  await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitFaultManagementPlugin.js', import.meta.url))
-  });
+  await page.addInitScript({ path: path.join(__dirname, './', 'addInitFaultManagementPlugin.js') });
 
   await navigateToFaultItemInTree(page);
 }
@@ -268,28 +265,29 @@ async function openFaultRowMenu(page, rowNumber) {
     .click();
 }
 
-export {
+// eslint-disable-next-line no-undef
+module.exports = {
+  navigateToFaultManagementWithExample,
+  navigateToFaultManagementWithStaticExample,
+  navigateToFaultManagementWithoutExample,
+  navigateToFaultItemInTree,
   acknowledgeFault,
+  shelveMultipleFaults,
   acknowledgeMultipleFaults,
+  shelveFault,
   changeViewTo,
-  clearSearch,
+  sortFaultsBy,
   enterSearchTerm,
+  clearSearch,
+  selectFaultItem,
+  getHighestSeverity,
+  getLowestSeverity,
+  getFaultResultCount,
   getFault,
   getFaultByName,
   getFaultName,
-  getFaultNamespace,
-  getFaultResultCount,
   getFaultSeverity,
+  getFaultNamespace,
   getFaultTriggerTime,
-  getHighestSeverity,
-  getLowestSeverity,
-  navigateToFaultItemInTree,
-  navigateToFaultManagementWithExample,
-  navigateToFaultManagementWithoutExample,
-  navigateToFaultManagementWithStaticExample,
-  openFaultRowMenu,
-  selectFaultItem,
-  shelveFault,
-  shelveMultipleFaults,
-  sortFaultsBy
+  openFaultRowMenu
 };

e2e/helper/notebookUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,11 +20,11 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { createDomainObjectWithDefaults } from '../appActions.js';
+const { createDomainObjectWithDefaults } = require('../appActions');
 
 const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
 const CUSTOM_NAME = 'CUSTOM_NAME';
-import { fileURLToPath } from 'url';
+const path = require('path');
 
 /**
  * @param {import('@playwright/test').Page} page
@@ -49,7 +49,7 @@ async function dragAndDropEmbed(page, notebookObject) {
   // Navigate to notebook
   await page.goto(notebookObject.url);
   // Expand the tree to reveal the notebook
-  await page.getByLabel('Show selected item in tree').click();
+  await page.click('button[title="Show selected item in tree"]');
   // Drag and drop the SWG into the notebook
   await page.dragAndDrop(`text=${swg.name}`, NOTEBOOK_DROP_AREA);
   await commitEntry(page);
@@ -69,9 +69,7 @@ async function commitEntry(page) {
  */
 async function startAndAddRestrictedNotebookObject(page) {
   // eslint-disable-next-line no-undef
-  await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitRestrictedNotebook.js', import.meta.url))
-  });
+  await page.addInitScript({ path: path.join(__dirname, 'addInitRestrictedNotebook.js') });
   await page.goto('./', { waitUntil: 'domcontentloaded' });
 
   return createDomainObjectWithDefaults(page, {
@@ -140,11 +138,12 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
   return notebook;
 }
 
-export {
-  createNotebookAndEntry,
-  createNotebookEntryAndTags,
-  dragAndDropEmbed,
+// eslint-disable-next-line no-undef
+module.exports = {
   enterTextEntry,
+  dragAndDropEmbed,
+  startAndAddRestrictedNotebookObject,
   lockPage,
-  startAndAddRestrictedNotebookObject
+  createNotebookEntryAndTags,
+  createNotebookAndEntry
 };

e2e/helper/planningUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { expect } from '../pluginFixtures.js';
+import { expect } from '../pluginFixtures';
 
 /**
  * Asserts that the number of activities in the plan view matches the number of
@@ -113,35 +113,17 @@ export async function assertPlanOrderedSwimLanes(page, plan, objectUrl) {
  * @param {string} planObjectUrl
  */
 export async function setBoundsToSpanAllActivities(page, planJson, planObjectUrl) {
+  const activities = Object.values(planJson).flat();
   // Get the earliest start value
-  const start = getEarliestStartTime(planJson);
+  const start = Math.min(...activities.map((activity) => activity.start));
   // Get the latest end value
-  const end = getLatestEndTime(planJson);
+  const end = Math.max(...activities.map((activity) => activity.end));
   // Set the start and end bounds to the earliest start and latest end
   await page.goto(
     `${planObjectUrl}?tc.mode=fixed&tc.startBound=${start}&tc.endBound=${end}&tc.timeSystem=utc&view=plan.view`
   );
 }
 
-/**
- * @param {object} planJson
- * @returns {number}
- */
-export function getEarliestStartTime(planJson) {
-  const activities = Object.values(planJson).flat();
-  return Math.min(...activities.map((activity) => activity.start));
-}
-
-/**
- *
- * @param {object} planJson
- * @returns {number}
- */
-export function getLatestEndTime(planJson) {
-  const activities = Object.values(planJson).flat();
-  return Math.max(...activities.map((activity) => activity.end));
-}
-
 /**
  * Uses the Open MCT API to set the status of a plan to 'draft'.
  * @param {import('@playwright/test').Page} page

e2e/helper/plotTagsUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { waitForPlotsToRender } from '../appActions.js';
-import { expect } from '../pluginFixtures.js';
+import { expect } from '../pluginFixtures';
+const { waitForPlotsToRender } = require('../appActions');
 
 /**
  * Given a canvas and a set of points, tags the points on the canvas.

e2e/helper/stylingUtils.js

@@ -1,104 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import { expect } from '../pluginFixtures.js';
-
-/**
- * Converts a hex color value to its RGB equivalent.
- *
- * @param {string} hex - The hex color value. i.e. '#5b0f00'
- * @returns {string} The RGB equivalent of the hex color.
- */
-function hexToRGB(hex) {
-  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-  return result
-    ? `rgb(${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)})`
-    : null;
-}
-
-/**
- * Sets the background and text color of a given element.
- *
- * @param {import('@playwright/test').Page} page - The Playwright page object.
- * @param {string} borderColorHex - The hex value of the border color to set, or 'No Style'.
- * @param {string} backgroundColorHex - The hex value of the background color to set, or 'No Style'.
- * @param {string} textColorHex - The hex value of the text color to set, or 'No Style'.
- * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be set.
- */
-async function setStyles(page, borderColorHex, backgroundColorHex, textColorHex, locator) {
-  await locator.click(); // Assuming the locator is clickable and opens the style setting UI
-  await page.getByLabel('Set border color').click();
-  await page.getByLabel(borderColorHex).click();
-  await page.getByLabel('Set background color').click();
-  await page.getByLabel(backgroundColorHex).click();
-  await page.getByLabel('Set text color').click();
-  await page.getByLabel(textColorHex).click();
-}
-
-/**
- * Checks if the styles of an element match the expected values.
- *
- * @param {string} expectedBorderColor - The expected border color in RGB format. Default is '#e6b8af' or 'rgb(230, 184, 175)'
- * @param {string} expectedBackgroundColor - The expected background color in RGB format.
- * @param {string} expectedTextColor - The expected text color in RGB format. Default is #aaaaaa or 'rgb(170, 170, 170)'
- * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be checked.
- */
-async function checkStyles(
-  expectedBorderColor,
-  expectedBackgroundColor,
-  expectedTextColor,
-  locator
-) {
-  const layoutStyles = await locator.evaluate((el) => {
-    return {
-      border: window.getComputedStyle(el).getPropertyValue('border-top-color'), //infer the left, right, and bottom
-      background: window.getComputedStyle(el).getPropertyValue('background-color'),
-      fontColor: window.getComputedStyle(el).getPropertyValue('color')
-    };
-  });
-  expect(layoutStyles.border).toContain(expectedBorderColor);
-  expect(layoutStyles.background).toContain(expectedBackgroundColor);
-  expect(layoutStyles.fontColor).toContain(expectedTextColor);
-}
-
-/**
- * Checks if the font Styles of an element match the expected values.
- *
- * @param {string} expectedFontSize - The expected font size in '72px' format. Default is 'Default'
- * @param {string} expectedFontWeight - The expected font Type. Format as '700' for bold. Default is 'Default'
- * @param {string} expectedFontFamily - The expected font Type. Format as "\"Andale Mono\", sans-serif". Default is 'Default'
- * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be checked.
- */
-async function checkFontStyles(expectedFontSize, expectedFontWeight, expectedFontFamily, locator) {
-  const layoutStyles = await locator.evaluate((el) => {
-    return {
-      fontSize: window.getComputedStyle(el).getPropertyValue('font-size'),
-      fontWeight: window.getComputedStyle(el).getPropertyValue('font-weight'),
-      fontFamily: window.getComputedStyle(el).getPropertyValue('font-family')
-    };
-  });
-  expect(layoutStyles.fontSize).toContain(expectedFontSize);
-  expect(layoutStyles.fontWeight).toContain(expectedFontWeight);
-  expect(layoutStyles.fontFamily).toContain(expectedFontFamily);
-}
-
-export { checkFontStyles, checkStyles, hexToRGB, setStyles };

e2e/helper/useSnowTheme.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/playwright-ci.config.js

@@ -1,8 +1,9 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
 // eslint-disable-next-line no-unused-vars
-import { devices } from '@playwright/test';
+const { devices } = require('@playwright/test');
 const MAX_FAILURES = 5;
 const NUM_WORKERS = 2;
 
@@ -10,7 +11,6 @@ const NUM_WORKERS = 2;
 const config = {
   retries: 2, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=5, this should ensure that flake is managed without failing the full suite
   testDir: 'tests',
-  grepInvert: /@mobile/, //Ignore mobile tests
   testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
   timeout: 60 * 1000,
   webServer: {
@@ -80,4 +80,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-local.config.js

@@ -1,11 +1,14 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
+// eslint-disable-next-line no-unused-vars
+const { devices } = require('@playwright/test');
+
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
   retries: 0,
   testDir: 'tests',
-  testMatch: '**/*.e2e.spec.js', // only run e2e tests
   testIgnore: '**/*.perf.spec.js',
   timeout: 30 * 1000,
   webServer: {
@@ -33,6 +36,7 @@ const config = {
     },
     {
       name: 'MMOC',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
@@ -44,6 +48,8 @@ const config = {
     },
     {
       name: 'safari',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
+      grep: /@ipad/, // only run ipad tests due to this bug https://github.com/microsoft/playwright/issues/8340
       grepInvert: /@snapshot/,
       use: {
         browserName: 'webkit'
@@ -51,6 +57,7 @@ const config = {
     },
     {
       name: 'firefox',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'firefox'
@@ -58,6 +65,7 @@ const config = {
     },
     {
       name: 'canary',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
@@ -66,11 +74,22 @@ const config = {
     },
     {
       name: 'chrome-beta',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
         channel: 'chrome-beta'
       }
+    },
+    {
+      name: 'ipad',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
+      grep: /@ipad/,
+      grepInvert: /@snapshot/,
+      use: {
+        browserName: 'webkit',
+        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
+      }
     }
   ],
   reporter: [
@@ -85,4 +104,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-mobile.config.js

@@ -1,69 +0,0 @@
-// playwright.config.js
-// @ts-check
-
-import { devices } from '@playwright/test';
-const MAX_FAILURES = 5;
-const NUM_WORKERS = 2;
-
-import { fileURLToPath } from 'url';
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-  retries: 1, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=5, this should ensure that flake is managed without failing the full suite
-  testDir: 'tests',
-  testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
-  timeout: 30 * 1000,
-  webServer: {
-    command: 'npm run start:coverage',
-    url: 'http://localhost:8080/#',
-    timeout: 200 * 1000,
-    reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
-  },
-  maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
-  workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
-  use: {
-    baseURL: 'http://localhost:8080/',
-    headless: true,
-    ignoreHTTPSErrors: true,
-    screenshot: 'only-on-failure',
-    trace: 'on-first-retry',
-    video: 'off'
-  },
-  projects: [
-    {
-      name: 'ipad',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    },
-    {
-      name: 'iphone',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPhone 14 Pro'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    }
-  ],
-  reporter: [
-    ['list'],
-    [
-      'html',
-      {
-        open: 'never',
-        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
-      }
-    ],
-    ['junit', { outputFile: '../test-results/results.xml' }]
-  ]
-};
-
-export default config;

e2e/playwright-performance-dev.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
@@ -39,4 +40,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-performance-prod.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
@@ -56,4 +57,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-visual-a11y.config.js

@@ -51,4 +51,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-watch.config.js

@@ -1,12 +1,15 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
-import { devices } from '@playwright/test';
-import { fileURLToPath } from 'url';
+// eslint-disable-next-line no-unused-vars
+const { devices } = require('@playwright/test');
+const MAX_FAILURES = 5;
+const NUM_WORKERS = 2;
 
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
-  retries: 0, //Retries are not needed with watch mode
+  retries: 0, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=5, this should ensure that flake is managed without failing the full suite
   testDir: 'tests',
   timeout: 60 * 1000,
   webServer: {
@@ -15,7 +18,8 @@ const config = {
     timeout: 200 * 1000,
     reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
   },
-  workers: '75%', //Limit to 75% of the CPU to support running with dev server
+  maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
+  workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
   use: {
     baseURL: 'http://localhost:8080/',
     headless: true,
@@ -31,28 +35,6 @@ const config = {
       use: {
         browserName: 'chromium'
       }
-    },
-    {
-      name: 'ipad',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    },
-    {
-      name: 'iphone',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPhone 14 Pro'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
     }
   ],
   reporter: [
@@ -64,8 +46,9 @@ const config = {
         outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
       }
     ],
-    ['junit', { outputFile: '../test-results/results.xml' }]
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    ['@deploysentinel/playwright']
   ]
 };
 
-export default config;
+module.exports = config;

e2e/test-data/examplePlans/ExamplePlan_Small1.json

@@ -6,8 +6,7 @@
       "end": 1660343797000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 1
+      "textColor": "white"
     },
     {
       "name": "Past event 2",
@@ -15,8 +14,7 @@
       "end": 1660429160000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 2
+      "textColor": "white"
     },
     {
       "name": "Past event 3",
@@ -24,8 +22,7 @@
       "end": 1660503981000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 3
+      "textColor": "white"
     },
     {
       "name": "Past event 4",
@@ -33,8 +30,7 @@
       "end": 1660624108000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 4
+      "textColor": "white"
     },
     {
       "name": "Past event 5",
@@ -42,8 +38,7 @@
       "end": 1660681529000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 5
+      "textColor": "white"
     }
   ]
 }

e2e/test-data/examplePlans/ExamplePlan_Small3.json

@@ -1,42 +0,0 @@
-{
-  "Group 1": [
-    {
-      "name": "Time until birthday",
-      "start": 1650320402000,
-      "end": 1660343797000,
-      "type": "Group 1",
-      "color": "orange",
-      "textColor": "white",
-      "id": 1
-    },
-    {
-      "name": "Time until supper",
-      "start": 1650320402000,
-      "end": 1650420410000,
-      "type": "Group 2",
-      "color": "blue",
-      "textColor": "white",
-      "id": 2
-    }
-  ],
-  "Group 2": [
-    {
-      "name": "Time since the last time I ate",
-      "start": 1650320102001,
-      "end": 1650320102001,
-      "type": "Group 2",
-      "color": "green",
-      "textColor": "white",
-      "id": 3
-    },
-    {
-      "name": "Time since last accident",
-      "start": 1650320102002,
-      "end": 1650320102002,
-      "type": "Group 1",
-      "color": "yellow",
-      "textColor": "white",
-      "id": 4
-    }
-  ]
-}

e2e/test-data/overlay_plot_storage.json

@@ -6,11 +6,11 @@
       "localStorage": [
         {
           "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},\"e78ca721-fb5e-409b-bf6d-597c87cb716f\":{\"identifier\":{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603880,\"location\":\"mine\",\"created\":1732413601740,\"persisted\":1732413603880},\"c6100044-56be-44b3-acca-6b9fddfb3849\":{\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602460,\"location\":\"mine\",\"created\":1732413602460,\"persisted\":1732413602460}}"
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602540,\"created\":1732413600760,\"persisted\":1732413602540},\"20e7d5fe-9cf8-4099-8957-9453a8954c67\":{\"identifier\":{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603960,\"location\":\"mine\",\"created\":1732413601820,\"persisted\":1732413603960},\"2db521a9-996d-4d04-a171-93f4c5c220af\":{\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"identifier\":{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"staleness\":false},\"modified\":1732413602540,\"location\":\"mine\",\"created\":1732413602540,\"persisted\":1732413602540}}"
         },
         {
           "name": "mct-recent-objects",
-          "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602460,\"location\":\"mine\",\"created\":1732413602460,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/c6100044-56be-44b3-acca-6b9fddfb3849\",\"domainObject\":{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602460,\"location\":\"mine\",\"created\":1732413602460,\"persisted\":1732413602460}},{\"objectPath\":[{\"identifier\":{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603880,\"location\":\"mine\",\"created\":1732413601740,\"persisted\":1732413603880},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"domainObject\":{\"identifier\":{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603880,\"location\":\"mine\",\"created\":1732413601740,\"persisted\":1732413603880}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine\",\"domainObject\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460}}]"
+          "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"staleness\":false},\"modified\":1732413602540,\"location\":\"mine\",\"created\":1732413602540,\"persisted\":1732413602540},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602540,\"created\":1732413600760,\"persisted\":1732413602540},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/2db521a9-996d-4d04-a171-93f4c5c220af\",\"domainObject\":{\"identifier\":{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"staleness\":false},\"modified\":1732413602540,\"location\":\"mine\",\"created\":1732413602540,\"persisted\":1732413602540}},{\"objectPath\":[{\"identifier\":{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603960,\"location\":\"mine\",\"created\":1732413601820,\"persisted\":1732413603960},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602540,\"created\":1732413600760,\"persisted\":1732413602540},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"domainObject\":{\"identifier\":{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603960,\"location\":\"mine\",\"created\":1732413601820,\"persisted\":1732413603960}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602540,\"created\":1732413600760,\"persisted\":1732413602540},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine\",\"domainObject\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"20e7d5fe-9cf8-4099-8957-9453a8954c67\",\"namespace\":\"\"},{\"key\":\"2db521a9-996d-4d04-a171-93f4c5c220af\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602540,\"created\":1732413600760,\"persisted\":1732413602540}}]"
         },
         {
           "name": "mct-tree-expanded",

e2e/test-data/overlay_plot_with_delay_storage.json

@@ -6,7 +6,7 @@
       "localStorage": [
         {
           "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413601720,\"created\":1732413600920,\"persisted\":1732413601720},\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\":{\"identifier\":{\"key\":\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\",\"namespace\":\"\"},\"name\":\"Overlay Plot with 5s Delay\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1732413603020,\"location\":\"mine\",\"created\":1732413601720,\"persisted\":1732413603020},\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\":{\"identifier\":{\"key\":\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":5000,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602920,\"location\":\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\",\"created\":1732413602420,\"persisted\":1732413602920}}"
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"98161570-a735-4a50-9c75-11b346ad3789\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413601340,\"created\":1732413600580,\"persisted\":1732413601340},\"98161570-a735-4a50-9c75-11b346ad3789\":{\"identifier\":{\"key\":\"98161570-a735-4a50-9c75-11b346ad3789\",\"namespace\":\"\"},\"name\":\"Overlay Plot with 5s Delay\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"477e60bb-4cba-4603-b4c9-2281ccf7e054\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"477e60bb-4cba-4603-b4c9-2281ccf7e054\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1732413602660,\"location\":\"mine\",\"created\":1732413601340,\"persisted\":1732413602660},\"477e60bb-4cba-4603-b4c9-2281ccf7e054\":{\"identifier\":{\"key\":\"477e60bb-4cba-4603-b4c9-2281ccf7e054\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":5000,\"infinityValues\":false,\"staleness\":false},\"modified\":1732413602520,\"location\":\"98161570-a735-4a50-9c75-11b346ad3789\",\"created\":1732413602040,\"persisted\":1732413602520}}"
         },
         {
           "name": "mct-tree-expanded",

e2e/tests/framework/appActions.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,13 +20,12 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {
+const { test, expect } = require('../../fixtures/pluginFixtures');
+const {
   createDomainObjectWithDefaults,
   createNotification,
-  expandEntireTree,
-  openObjectTreeContextMenu
-} from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+  expandEntireTree
+} = require('../../appActions.js');
 
 test.describe('AppActions', () => {
   test('createDomainObjectsWithDefaults', async ({ page }) => {
@@ -156,7 +155,7 @@ test.describe('AppActions', () => {
 
     await page.goto('./#/browse/mine');
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click the object specified by 'type'
     await page.click(`li[role='menuitem']:text("Clock")`);
@@ -167,13 +166,4 @@ test.describe('AppActions', () => {
     const locatorTreeCollapsedItems = locatorTree.locator('role=treeitem[expanded=false]');
     expect(await locatorTreeCollapsedItems.count()).toBe(0);
   });
-  test('openObjectTreeContextMenu', async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-    const folder = await createDomainObjectWithDefaults(page, {
-      type: 'Folder'
-    });
-    await openObjectTreeContextMenu(page, folder.url);
-    await expect(page.getByLabel('Menu')).toBeVisible();
-  });
 });

e2e/tests/framework/baseFixtures.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -26,7 +26,7 @@ relates to how we've extended it (i.e. ./e2e/baseFixtures.js) and assumptions ma
 (`npm start` and ./e2e/webpack-dev-middleware.js)
 */
 
-import { test } from '../../baseFixtures.js';
+const { test } = require('../../baseFixtures.js');
 
 test.describe('baseFixtures tests', () => {
   //Skip this test for now https://github.com/nasa/openmct/issues/6785

e2e/tests/framework/exampleTemplate.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,8 +45,8 @@
  */
 
 // Structure: Some standard Imports. Please update the required pathing.
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
 
 /**
  * Structure:
@@ -164,7 +164,7 @@ async function renameTimerFrom3DotMenu(page, timerUrl, newNameForTimer) {
   await page.goto(timerUrl);
 
   // Click on 3 Dot Menu
-  await page.locator('button[title="More actions"]').click();
+  await page.locator('button[title="More options"]').click();
 
   // Click text=Edit Properties...
   await page.locator('text=Edit Properties...').click();

e2e/tests/framework/generateLocalStorageData.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2022, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* global __dirname */
 /**
  * This test suite is dedicated to generating LocalStorage via Session Storage to be used
  * in some visual test suites like controlledClock.visual.spec.js. This suite should run to completion
@@ -31,11 +32,13 @@
  * and is additionally verified in the validation test suites below.
  */
 
-import { fileURLToPath } from 'url';
-
-import { createDomainObjectWithDefaults, createExampleTelemetryObject } from '../../appActions.js';
-import { MISSION_TIME } from '../../constants.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures.js');
+const {
+  createDomainObjectWithDefaults,
+  createExampleTelemetryObject
+} = require('../../appActions.js');
+const { MISSION_TIME } = require('../../constants.js');
+const path = require('path');
 
 const overlayPlotName = 'Overlay Plot with Telemetry Object';
 
@@ -53,28 +56,29 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
   });
 
   test('Generate display layout with 2 child display layouts', async ({ page, context }) => {
+    // Create Display Layout
     const parent = await createDomainObjectWithDefaults(page, {
       type: 'Display Layout',
       name: 'Parent Display Layout'
     });
-    await createDomainObjectWithDefaults(page, {
+    const child1 = await createDomainObjectWithDefaults(page, {
       type: 'Display Layout',
       name: 'Child Layout 1',
       parent: parent.uuid
     });
-    await createDomainObjectWithDefaults(page, {
+    const child2 = await createDomainObjectWithDefaults(page, {
       type: 'Display Layout',
       name: 'Child Layout 2',
       parent: parent.uuid
     });
 
-    await page.goto(parent.url, { waitUntil: 'domcontentloaded' });
-    await page.getByLabel('Edit Object').click();
-    await page.getByLabel('Child Layout 2 Layout', { exact: true }).hover();
+    await page.goto(parent.url);
+    await page.getByLabel('Edit').click();
+    await page.getByLabel(`${child2.name} Layout Grid`).hover();
     await page.getByLabel('Move Sub-object Frame').nth(1).click();
     await page.getByLabel('X:').fill('30');
 
-    await page.getByLabel('Child Layout 1 Layout', { exact: true }).hover();
+    await page.getByLabel(`${child1.name} Layout Grid`).hover();
     await page.getByLabel('Move Sub-object Frame').first().click();
     await page.getByLabel('Y:').fill('30');
 
@@ -83,9 +87,7 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
 
     //Save localStorage for future test execution
     await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/display_layout_with_child_layouts.json', import.meta.url)
-      )
+      path: path.join(__dirname, '../../../e2e/test-data/display_layout_with_child_layouts.json')
     });
   });
 
@@ -106,13 +108,11 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
       parent: parent.uuid
     });
 
-    await page.goto(parent.url, { waitUntil: 'domcontentloaded' });
+    await page.goto(parent.url);
 
     //Save localStorage for future test execution
     await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/flexible_layout_with_child_layouts.json', import.meta.url)
-      )
+      path: path.join(__dirname, '../../../e2e/test-data/flexible_layout_with_child_layouts.json')
     });
   });
 
@@ -130,10 +130,10 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
     const exampleTelemetry = await createExampleTelemetryObject(page);
 
     // Make Link from Telemetry Object to Overlay Plot
-    await page.locator('button[title="More actions"]').click();
+    await page.locator('button[title="More options"]').click();
 
     // Select 'Create Link' from dropdown
-    await page.getByRole('menuitem', { name: 'Create Link' }).click();
+    await page.getByRole('menuitem', { name: ' Create Link' }).click();
 
     // Search and Select for overlay Plot within Create Modal
     await page.getByRole('dialog').getByRole('searchbox', { name: 'Search Input' }).click();
@@ -189,9 +189,7 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
 
     // Save localStorage for future test execution
     await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/overlay_plot_storage.json', import.meta.url)
-      )
+      path: path.join(__dirname, '../../../e2e/test-data/overlay_plot_storage.json')
     });
   });
   // TODO: Merge this with previous test. Edit object created in previous test.
@@ -205,8 +203,8 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
     const swgWith5sDelay = await createExampleTelemetryObject(page, overlayPlot.uuid);
 
     await page.goto(swgWith5sDelay.url);
-    await page.getByLabel('More actions').click();
-    await page.getByLabel('Edit Properties...').click();
+    await page.getByTitle('More options').click();
+    await page.getByRole('menuitem', { name: ' Edit Properties...' }).click();
 
     //Edit Example Telemetry Object to include 5s loading Delay
     await page.locator('[aria-label="Loading Delay \\(ms\\)"]').fill('5000');
@@ -225,21 +223,17 @@ test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
 
     // Clear Recently Viewed
     await page.getByRole('button', { name: 'Clear Recently Viewed' }).click();
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
+    await page.getByRole('button', { name: 'OK' }).click();
     //Save localStorage for future test execution
     await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/overlay_plot_with_delay_storage.json', import.meta.url)
-      )
+      path: path.join(__dirname, '../../../e2e/test-data/overlay_plot_with_delay_storage.json')
     });
   });
 });
 
 test.describe('Validate Overlay Plot with Telemetry Object @localStorage @generatedata', () => {
   test.use({
-    storageState: fileURLToPath(
-      new URL('../../../e2e/test-data/overlay_plot_storage.json', import.meta.url)
-    )
+    storageState: path.join(__dirname, '../../../e2e/test-data/overlay_plot_storage.json')
   });
   test('Validate Overlay Plot with Telemetry Object', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
@@ -281,8 +275,9 @@ test.describe('Validate Overlay Plot with Telemetry Object @localStorage @genera
 
 test.describe('Validate Overlay Plot with 5s Delay Telemetry Object @localStorage @generatedata', () => {
   test.use({
-    storageState: fileURLToPath(
-      new URL('../../../e2e/test-data/overlay_plot_with_delay_storage.json', import.meta.url)
+    storageState: path.join(
+      __dirname,
+      '../../../e2e/test-data/overlay_plot_with_delay_storage.json'
     )
   });
   test('Validate Overlay Plot with Telemetry Object', async ({ page }) => {

e2e/tests/framework/pluginFixtures.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,7 +25,7 @@ This test suite is dedicated to testing our use of our custom fixtures to verify
 that they are working as expected.
 */
 
-import { test } from '../../pluginFixtures.js';
+const { test } = require('../../pluginFixtures.js');
 
 // eslint-disable-next-line playwright/no-skipped-test
 test.describe.skip('pluginFixtures tests', () => {

e2e/tests/functional/example/eventGenerator.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 This test suite is dedicated to tests which verify the basic operations surrounding the example event generator.
 */
 
-import { createDomainObjectWithDefaults } from '../../../appActions.js';
-import { expect, test } from '../../../pluginFixtures.js';
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../appActions');
 
 test.describe('Example Event Generator CRUD Operations', () => {
   test('Can create a Test Event Generator and it results in the table View', async ({ page }) => {

e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding conditionSets.
 */
 
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Sine Wave Generator', () => {
   test('Create new Sine Wave Generator Object and validate create Form Logic', async ({
@@ -38,7 +38,7 @@ test.describe('Sine Wave Generator', () => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click Sine Wave Generator
     await page.click('text=Sine Wave Generator');

e2e/tests/functional/features/branding.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,36 +24,42 @@
 This test suite is dedicated to tests which verify branding related components.
 */
 
-import { expect, test } from '../../baseFixtures.js';
+const { test, expect } = require('../../../baseFixtures.js');
 
 test.describe('Branding tests', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
   test('About Modal launches with basic branding properties', async ({ page }) => {
-    await page.getByLabel('About Modal').click();
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Click About button
+    await page.click('.l-shell__app-logo');
 
     // Verify that the NASA Logo Appears
-    await expect(page.getByAltText('Open MCT Splash Logo')).toBeVisible();
+    await expect(page.locator('.c-about__image')).toBeVisible();
 
     // Modify the Build information in 'about' Modal
-    await expect.soft(page.getByLabel('Version Number')).toContainText(/Version: \d/);
+    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info').first();
+    await expect(versionInformationLocator).toBeEnabled();
+    await expect.soft(versionInformationLocator).toContainText(/Version: \d/);
     await expect
-      .soft(page.getByLabel('Build Date'))
+      .soft(versionInformationLocator)
       .toContainText(/Build Date: ((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun))/);
-    await expect.soft(page.getByLabel('Revision')).toContainText(/Revision: \b[0-9a-f]{5,40}\b/);
-    await expect.soft(page.getByLabel('Branch')).toContainText(/Branch: ./);
+    await expect.soft(versionInformationLocator).toContainText(/Revision: \b[0-9a-f]{5,40}\b/);
+    await expect.soft(versionInformationLocator).toContainText(/Branch: ./);
   });
   test('Verify Links in About Modal @2p', async ({ page }) => {
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
     // Click About button
-    await page.getByLabel('About Modal').click();
+    await page.click('.l-shell__app-logo');
 
     // Verify that clicking on the third party licenses information opens up another tab on licenses url
     const [page2] = await Promise.all([
       page.waitForEvent('popup'),
-      page.getByText('click here for third party licensing information').click()
+      page.locator('text=click here for third party licensing information').click()
     ]);
-    await page2.waitForLoadState('domcontentloaded'); //Avoids timing issues with juggler/firefox
+    await page2.waitForLoadState('networkidle'); //Avoids timing issues with juggler/firefox
     expect(page2.waitForURL('**/licenses**')).toBeTruthy();
   });
 });

e2e/tests/functional/features/clearDataAction.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 Verify that the "Clear Data" menu action performs as expected for various object types.
 */
 
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures.js');
+const { createDomainObjectWithDefaults } = require('../../appActions.js');
 
 const backgroundImageSelector = '.c-imagery__main-image__background-image';
 
@@ -43,22 +43,17 @@ test.describe('Clear Data Action', () => {
     await expect(page.locator(backgroundImageSelector)).toBeVisible();
   });
   test('works as expected with Example Imagery', async ({ page }) => {
-    expect(await page.locator('.c-thumb__image').count()).toBeGreaterThan(0);
+    await expect(await page.locator('.c-thumb__image').count()).toBeGreaterThan(0);
     // Click the "Clear Data" menu action
-    await page.getByTitle('More actions').click();
-    await expect(
-      page.getByRole('menuitem', {
-        name: 'Clear Data for Object'
-      })
-    ).toBeEnabled();
-    await page
-      .getByRole('menuitem', {
-        name: 'Clear Data for Object'
-      })
-      .click();
+    await page.getByTitle('More options').click();
+    const clearDataMenuItem = page.getByRole('menuitem', {
+      name: 'Clear Data'
+    });
+    await expect(clearDataMenuItem).toBeEnabled();
+    await clearDataMenuItem.click();
 
     // Verify that the background image is no longer visible
     await expect(page.locator(backgroundImageSelector)).toBeHidden();
-    expect(await page.locator('.c-thumb__image').count()).toBe(0);
+    await expect(await page.locator('.c-thumb__image').count()).toBe(0);
   });
 });

e2e/tests/functional/features/clocks/clock.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Clock.
 */
 
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Clock Generator CRUD Operations', () => {
   test('Timezone dropdown will collapse when clicked outside or on dropdown icon again', async ({
@@ -38,7 +38,7 @@ test.describe('Clock Generator CRUD Operations', () => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click Clock
     await page.getByRole('menuitem').first().click();

e2e/tests/functional/features/clocks/remoteClock.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -22,7 +22,7 @@
 
 // FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Remote Clock', () => {
   // eslint-disable-next-line require-await

e2e/tests/functional/features/conditionSet/conditionSet.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,29 +19,30 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify the basic operations surrounding conditionSets. Note: this
 suite is sharing state between tests which is considered an anti-pattern. Implementing in this way to
 demonstrate some playwright for test developers. This pattern should not be re-used in other CRUD suites.
 */
 
-import { fileURLToPath } from 'url';
-
-import {
+const { test, expect } = require('../../../../pluginFixtures.js');
+const {
   createDomainObjectWithDefaults,
   createExampleTelemetryObject
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+} = require('../../../../appActions');
+const path = require('path');
 
 let conditionSetUrl;
+let getConditionSetIdentifierFromUrl;
 
-test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () => {
+test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
   test.beforeAll(async ({ browser }) => {
     //TODO: This needs to be refactored
     const context = await browser.newContext();
     const page = await context.newPage();
     await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     await page.locator('li[role="menuitem"]:has-text("Condition Set")').click();
 
@@ -49,54 +50,47 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
 
     //Save localStorage for future test execution
     await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../../test-data/recycled_local_storage.json', import.meta.url)
-      )
+      path: path.resolve(__dirname, '../../../../test-data/recycled_local_storage.json')
     });
 
     //Set object identifier from url
     conditionSetUrl = page.url();
 
+    getConditionSetIdentifierFromUrl = conditionSetUrl.split('/').pop().split('?')[0];
+    console.debug(`getConditionSetIdentifierFromUrl: ${getConditionSetIdentifierFromUrl}`);
     await page.close();
   });
 
   //Load localStorage for subsequent tests
   test.use({
-    storageState: fileURLToPath(
-      new URL('../../../../test-data/recycled_local_storage.json', import.meta.url)
-    )
+    storageState: path.resolve(__dirname, '../../../../test-data/recycled_local_storage.json')
   });
 
   //Begin suite of tests again localStorage
-  test.fixme(
-    'Condition set object properties persist in main view and inspector @localStorage',
-    async ({ page }) => {
-      test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/7421'
-      });
-      //Navigate to baseURL with injected localStorage
-      await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
+  test('Condition set object properties persist in main view and inspector @localStorage', async ({
+    page
+  }) => {
+    //Navigate to baseURL with injected localStorage
+    await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
 
-      //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
-      await expect
-        .soft(page.locator('.l-browse-bar__object-name'))
-        .toContainText('Unnamed Condition Set');
+    //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');
 
-      //Assertions on loaded Condition Set in Inspector
-      expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
+    //Assertions on loaded Condition Set in Inspector
+    expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
 
-      //Reload Page
-      await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);
+    //Reload Page
+    await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);
 
-      //Re-verify after reload
-      await expect
-        .soft(page.locator('.l-browse-bar__object-name'))
-        .toContainText('Unnamed Condition Set');
-      //Assertions on loaded Condition Set in Inspector
-      expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
-    }
-  );
+    //Re-verify after reload
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');
+    //Assertions on loaded Condition Set in Inspector
+    expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
+  });
   test('condition set object can be modified on @localStorage', async ({ page, openmctConfig }) => {
     const { myItemsFolderName } = openmctConfig;
 
@@ -198,7 +192,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
       .first()
       .click();
     // Click hamburger button
-    await page.locator('[title="More actions"]').click();
+    await page.locator('[title="More options"]').click();
 
     // Click 'Remove' and press OK
     await page.locator('li[role="menuitem"]:has-text("Remove")').click();
@@ -236,7 +230,7 @@ test.describe('Basic Condition Set Use', () => {
     await page.goto(conditionSet.url);
 
     // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Click Add Condition button
     await page.locator('#addCondition').click();
@@ -264,7 +258,7 @@ test.describe('Basic Condition Set Use', () => {
     await page.goto(conditionSet.url);
 
     // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     page.click('button[title="Show selected item in tree"]');
@@ -301,7 +295,7 @@ test.describe('Basic Condition Set Use', () => {
     await page.getByTitle('Show selected item in tree').click();
     await page.goto(conditionSet.url);
     // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Create two conditions
     await page.locator('#addCondition').click();
@@ -368,7 +362,7 @@ test.describe('Basic Condition Set Use', () => {
 
     // Edit SWG to add 8 second loading delay to simulate the case
     // where telemetry is not available.
-    await page.getByTitle('More actions').click();
+    await page.getByTitle('More options').click();
     await page.getByRole('menuitem', { name: 'Edit Properties...' }).click();
     await page.getByRole('spinbutton', { name: 'Loading Delay (ms)' }).fill('8000');
     await page.getByLabel('Save').click();

e2e/tests/functional/features/couchdb.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,7 +25,7 @@
  *
  */
 
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
 
 test.describe('CouchDB Status Indicator with mocked responses @couchdb', () => {
   test.use({ failOnConsoleError: false });

e2e/tests/functional/features/displayLayout/displayLayout.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,19 +19,20 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import { fileURLToPath } from 'url';
-
-import {
+/* global __dirname */
+const { test, expect } = require('../../../../pluginFixtures');
+const path = require('path');
+const {
   createDomainObjectWithDefaults,
+  setStartOffset,
   setFixedTimeMode,
-  setIndependentTimeConductorBounds,
   setRealTimeMode,
-  setStartOffset
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+  setIndependentTimeConductorBounds
+} = require('../../../../appActions');
 
-const LOCALSTORAGE_PATH = fileURLToPath(
-  new URL('../../../../test-data/display_layout_with_child_layouts.json', import.meta.url)
+const LOCALSTORAGE_PATH = path.resolve(
+  __dirname,
+  '../../../../test-data/display_layout_with_child_layouts.json'
 );
 const TINY_IMAGE_BASE64 =
   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII';
@@ -47,10 +48,10 @@ test.describe('Display Layout Toolbar Actions @localStorage', () => {
       .filter({ hasText: 'Parent Display Layout Display Layout' })
       .first()
       .click();
-    await page.getByLabel('Edit Object').click();
+    await page.getByLabel('Edit').click();
   });
   test.use({
-    storageState: LOCALSTORAGE_PATH
+    storageState: path.resolve(__dirname, LOCALSTORAGE_PATH)
   });
 
   test('can add/remove Text element to a single layout', async ({ page }) => {
@@ -133,7 +134,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -161,13 +162,6 @@ test.describe('Display Layout', () => {
     const trimmedDisplayValue = displayLayoutValue.trim();
 
     expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
-
-    // ensure we can right click on the alpha-numeric widget and view historical data
-    await page.getByLabel('Sine', { exact: true }).click({
-      button: 'right'
-    });
-    await page.getByLabel('View Historical Data').click();
-    await expect(page.getByLabel('Plot Container Style Target')).toBeVisible();
   });
   test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({
     page
@@ -178,7 +172,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -220,7 +214,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -262,7 +256,7 @@ test.describe('Display Layout', () => {
       type: 'Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -308,7 +302,7 @@ test.describe('Display Layout', () => {
       type: 'Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -364,7 +358,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -456,7 +450,7 @@ async function removeLayoutObject(page, layoutObject) {
     // eslint-disable-next-line playwright/no-force-option
     .click({ force: true });
   await page.getByTitle('Delete the selected object').click();
-  await page.getByRole('button', { name: 'OK', exact: true }).click();
+  await page.getByRole('button', { name: 'OK' }).click();
 }
 
 /**

e2e/tests/functional/features/faultManagement/faultManagement.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import * as utils from '../../../../helper/faultUtils.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures');
+const utils = require('../../../../helper/faultUtils');
 
 test.describe('The Fault Management Plugin using example faults', () => {
   test.beforeEach(async ({ page }) => {

e2e/tests/functional/features/flexibleLayout/flexibleLayout.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,17 +19,18 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* global __dirname */
 
-import { fileURLToPath } from 'url';
-
-import {
+const { test, expect } = require('../../../../pluginFixtures');
+const {
   createDomainObjectWithDefaults,
   setIndependentTimeConductorBounds
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+} = require('../../../../appActions');
+const path = require('path');
 
-const LOCALSTORAGE_PATH = fileURLToPath(
-  new URL('../../../../test-data/flexible_layout_with_child_layouts.json', import.meta.url)
+const LOCALSTORAGE_PATH = path.resolve(
+  __dirname,
+  '../../../../test-data/flexible_layout_with_child_layouts.json'
 );
 
 test.describe('Flexible Layout', () => {
@@ -73,7 +74,7 @@ test.describe('Flexible Layout', () => {
   }) => {
     await page.goto(flexibleLayout.url);
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
@@ -166,7 +167,7 @@ test.describe('Flexible Layout', () => {
   }) => {
     await page.goto(flexibleLayout.url);
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
@@ -197,7 +198,7 @@ test.describe('Flexible Layout', () => {
     });
     await page.goto(flexibleLayout.url);
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -234,7 +235,7 @@ test.describe('Flexible Layout', () => {
 
     await page.goto(flexibleLayout.url);
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -266,7 +267,7 @@ test.describe('Flexible Layout', () => {
 
 test.describe('Flexible Layout Toolbar Actions @localStorage', () => {
   test.use({
-    storageState: LOCALSTORAGE_PATH
+    storageState: path.resolve(__dirname, LOCALSTORAGE_PATH)
   });
 
   test.beforeEach(async ({ page }) => {
@@ -276,43 +277,40 @@ test.describe('Flexible Layout Toolbar Actions @localStorage', () => {
       .filter({ hasText: 'Parent Flexible Layout Flexible Layout' })
       .first()
       .click();
-    await page.getByLabel('Edit Object').click();
+    await page.getByLabel('Edit').click();
   });
   test('Add/Remove Container', async ({ page }) => {
     test.info().annotations.push({
       type: 'issue',
       description: 'https://github.com/nasa/openmct/issues/7234'
     });
-
-    const containerHandles = page.getByRole('columnheader', { name: 'Handle' });
-    expect(await containerHandles.count()).toEqual(2);
-    await page.getByRole('columnheader', { name: 'Container Handle 1' }).click();
+    expect(await page.getByRole('group', { name: 'Container' }).count()).toEqual(2);
+    await page.getByRole('group', { name: 'Container' }).nth(1).click();
     await page.getByTitle('Add Container').click();
-    expect(await containerHandles.count()).toEqual(3);
+    expect(await page.getByRole('group', { name: 'Container' }).count()).toEqual(3);
     await page.getByTitle('Remove Container').click();
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toHaveText(
+    await expect(page.getByRole('dialog')).toHaveText(
       'This action will permanently delete this container from this Flexible Layout. Do you want to continue?'
     );
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
-    expect(await containerHandles.count()).toEqual(2);
+    await page.getByRole('button', { name: 'OK' }).click();
+    expect(await page.getByRole('group', { name: 'Container' }).count()).toEqual(2);
   });
   test('Remove Frame', async ({ page }) => {
     expect(await page.getByRole('group', { name: 'Frame' }).count()).toEqual(2);
     await page.getByRole('group', { name: 'Child Layout 1' }).click();
     await page.getByTitle('Remove Frame').click();
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toHaveText(
+    await expect(page.getByRole('dialog')).toHaveText(
       'This action will remove this frame from this Flexible Layout. Do you want to continue?'
     );
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
+    await page.getByRole('button', { name: 'OK' }).click();
     expect(await page.getByRole('group', { name: 'Frame' }).count()).toEqual(1);
   });
   test('Columns/Rows Layout Toggle', async ({ page }) => {
-    await page.getByRole('columnheader', { name: 'Container Handle 1' }).click();
-    const flexRows = page.getByLabel('Flexible Layout Row');
-    expect(await flexRows.count()).toEqual(0);
+    await page.getByRole('group', { name: 'Container' }).nth(1).click();
+    expect(await page.locator('.c-fl--rows').count()).toEqual(0);
     await page.getByTitle('Columns layout').click();
-    expect(await flexRows.count()).toEqual(1);
+    expect(await page.locator('.c-fl--rows').count()).toEqual(1);
     await page.getByTitle('Rows layout').click();
-    expect(await flexRows.count()).toEqual(0);
+    expect(await page.locator('.c-fl--rows').count()).toEqual(0);
   });
 });

e2e/tests/functional/features/forms.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,16 +19,15 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify form functionality in isolation
 */
 
-import { fileURLToPath } from 'url';
-import { v4 as genUuid } from 'uuid';
-
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
+const genUuid = require('uuid').v4;
+const path = require('path');
 
 const TEST_FOLDER = 'test folder';
 const jsonFilePath = 'e2e/test-data/ExampleLayouts.json';
@@ -41,8 +40,8 @@ test.describe('Form Validation Behavior', () => {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
-    await page.getByRole('menuitem', { name: 'Folder' }).click();
+    await page.click('button:has-text("Create")');
+    await page.getByRole('menuitem', { name: ' Folder' }).click();
 
     // Fill in empty string into title and trigger validation with 'Tab'
     await page.click('text=Properties Title Notes >> input[type="text"]');
@@ -73,14 +72,14 @@ test.describe('Form Validation Behavior', () => {
 test.describe('Form File Input Behavior', () => {
   test.beforeEach(async ({ page }) => {
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addInitFileInputObject.js', import.meta.url))
+      path: path.join(__dirname, '../../helper', 'addInitFileInputObject.js')
     });
   });
 
   test('Can select a JSON file type', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.getByRole('button', { name: ' Create ' }).click();
     await page.getByRole('menuitem', { name: 'JSON File Input Object' }).click();
 
     await page.setInputFiles('#fileElem', jsonFilePath);
@@ -94,7 +93,7 @@ test.describe('Form File Input Behavior', () => {
   test('Can select an image file type', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.getByRole('button', { name: ' Create ' }).click();
     await page.getByRole('menuitem', { name: 'Image File Input Object' }).click();
 
     await page.setInputFiles('#fileElem', imageFilePath);
@@ -110,7 +109,7 @@ test.describe('Persistence operations @addInit', () => {
   // add non persistable root item
   test.beforeEach(async ({ page }) => {
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addNoneditableObject.js', import.meta.url))
+      path: path.join(__dirname, '../../helper', 'addNoneditableObject.js')
     });
   });
 
@@ -121,7 +120,7 @@ test.describe('Persistence operations @addInit', () => {
     });
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     await page.click('text=Condition Set');
 
@@ -158,7 +157,7 @@ test.describe('Persistence operations @couchdb', () => {
     });
 
     // Open the edit form for the clock object
-    await page.click('button[title="More actions"]');
+    await page.click('button[title="More options"]');
     await page.click('li[title="Edit properties of this object."]');
 
     // Modify the display format from default 12hr -> 24hr and click 'Save'

e2e/tests/functional/features/gauge/gauge.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,13 +24,12 @@
  * This test suite is dedicated to testing the Gauge component.
  */
 
-import { v4 as uuid } from 'uuid';
-
-import {
+const { test, expect } = require('../../../../pluginFixtures');
+const {
   createDomainObjectWithDefaults,
   createExampleTelemetryObject
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+} = require('../../../../appActions');
+const uuid = require('uuid').v4;
 
 test.describe('Gauge', () => {
   test.beforeEach(async ({ page }) => {
@@ -41,6 +40,8 @@ test.describe('Gauge', () => {
   test('Can add and remove telemetry sources @unstable', async ({ page }) => {
     // Create the gauge with defaults
     const gauge = await createDomainObjectWithDefaults(page, { type: 'Gauge' });
+    const editButtonLocator = page.locator('button[title="Edit"]');
+    const saveButtonLocator = page.locator('button[title="Save"]');
 
     // Create a sine wave generator within the gauge
     const swg1 = await createDomainObjectWithDefaults(page, {
@@ -52,9 +53,9 @@ test.describe('Gauge', () => {
     // Navigate to the gauge and verify that
     // the SWG appears in the elements pool
     await page.goto(gauge.url);
-    await page.getByLabel('Edit Object').click();
+    await editButtonLocator.click();
     await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeVisible();
-    await page.getByRole('button', { name: 'Save' }).click();
+    await saveButtonLocator.click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
     // Create another sine wave generator within the gauge
@@ -77,10 +78,10 @@ test.describe('Gauge', () => {
     // Navigate to the gauge and verify that the new SWG
     // appears in the elements pool and the old one is gone
     await page.goto(gauge.url);
-    await page.getByLabel('Edit Object').click();
+    await editButtonLocator.click();
     await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeHidden();
     await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg2.name}`)).toBeVisible();
-    await page.getByRole('button', { name: 'Save' }).click();
+    await saveButtonLocator.click();
 
     // Right click on the new SWG in the elements pool and delete it
     await page.locator(`#inspector-elements-tree >> text=${swg2.name}`).click({
@@ -107,7 +108,7 @@ test.describe('Gauge', () => {
       description: 'https://github.com/nasa/openmct/issues/5356'
     });
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click the object specified by 'type'
     await page.click(`li[role='menuitem']:text("Gauge")`);
@@ -126,7 +127,7 @@ test.describe('Gauge', () => {
 
     // Create the gauge with defaults
     await createDomainObjectWithDefaults(page, { type: 'Gauge' });
-    await page.click('button[title="More actions"]');
+    await page.click('button[title="More options"]');
     await page.click('li[role="menuitem"]:has-text("Edit Properties")');
     // FIXME: We need better selectors for these custom form controls
     const displayCurrentValueSwitch = page.locator('.c-toggle-switch__slider >> nth=0');
@@ -136,11 +137,7 @@ test.describe('Gauge', () => {
     // TODO: Verify changes in the UI
   });
 
-  test.fixme('Gauge does not display NaN when data not available', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7421'
-    });
+  test('Gauge does not display NaN when data not available', async ({ page }) => {
     // Create a Gauge
     const gauge = await createDomainObjectWithDefaults(page, {
       type: 'Gauge'
@@ -150,7 +147,7 @@ test.describe('Gauge', () => {
     const swgWith5sDelay = await createExampleTelemetryObject(page, gauge.uuid);
 
     await page.goto(swgWith5sDelay.url);
-    await page.getByTitle('More actions').click();
+    await page.getByTitle('More options').click();
     await page.getByRole('menuitem', { name: /Edit Properties.../ }).click();
 
     //Edit Example Telemetry Object to include 5s loading Delay

e2e/tests/functional/features/imagery/exampleImagery.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,9 +25,9 @@ This test suite is dedicated to tests which verify the basic operations surround
 but only assume that example imagery is present.
 */
 /* globals process */
-import { createDomainObjectWithDefaults, setRealTimeMode } from '../../../../appActions.js';
-import { waitForAnimations } from '../../../../baseFixtures.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { waitForAnimations } = require('../../../../baseFixtures');
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults, setRealTimeMode } = require('../../../../appActions');
 const backgroundImageSelector = '.c-imagery__main-image__background-image';
 const panHotkey = process.platform === 'linux' ? ['Shift', 'Alt'] : ['Alt'];
 const tagHotkey = ['Shift', 'Alt'];
@@ -61,31 +61,6 @@ test.describe('Example Imagery Object', () => {
     await expect(page.locator('.c-hud')).toBeHidden();
   });
 
-  test('Can right click on image and open it in a new tab @2p', async ({ page, context }) => {
-    // try to right click on image
-    const backgroundImage = await page.locator(backgroundImageSelector);
-    await backgroundImage.click({
-      button: 'right',
-      // eslint-disable-next-line playwright/no-force-option
-      force: true
-    });
-    // expect context menu to appear
-    await expect(page.getByText('Save Image As')).toBeVisible();
-    await expect(page.getByText('Open Image in New Tab')).toBeVisible();
-
-    // click on open image in new tab
-    const pagePromise = context.waitForEvent('page');
-    await page.getByText('Open Image in New Tab').click();
-    // expect new tab to be in browser
-    const newPage = await pagePromise;
-    await newPage.waitForLoadState();
-    // expect new tab url to have jpg in it
-    await expect(newPage.url()).toContain('.jpg');
-  });
-
-  // this requires CORS to be enabled in some fashion
-  test.fixme('Can right click on image and save it as a file', async ({ page }) => {});
-
   test('Can adjust image brightness/contrast by dragging the sliders', async ({
     page,
     browserName
@@ -363,7 +338,7 @@ test.describe('Example Imagery in Display Layout', () => {
     await page.locator('li[title="View Large"]').click();
     await expect(pausePlayButton).toHaveClass(/is-paused/);
 
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.locator('[aria-label="Close"]').click();
     await expect.soft(pausePlayButton).not.toHaveClass(/is-paused/);
   });
 
@@ -386,7 +361,7 @@ test.describe('Example Imagery in Display Layout', () => {
     await page.locator('li[title="View Large"]').click();
     await expect(pausePlayButton).toHaveClass(/is-paused/);
 
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.locator('[aria-label="Close"]').click();
     await expect.soft(pausePlayButton).toHaveClass(/is-paused/);
   });
 
@@ -397,7 +372,7 @@ test.describe('Example Imagery in Display Layout', () => {
     });
 
     // Edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.click('button[title="Edit"]');
 
     // Click on example imagery to expose toolbar
     await page.locator('.c-so-view__header').click();
@@ -416,7 +391,7 @@ test.describe('Example Imagery in Display Layout', () => {
   test('Resizing the layout changes thumbnail visibility and size', async ({ page }) => {
     const thumbsWrapperLocator = page.locator('.c-imagery__thumbs-wrapper');
     // Edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.click('button[title="Edit"]');
 
     // Click on example imagery to expose toolbar
     await page.locator('.c-so-view__header').click();
@@ -485,33 +460,6 @@ test.describe('Example Imagery in Display Layout', () => {
 
 test.describe('Example Imagery in Flexible layout', () => {
   let flexibleLayout;
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-    flexibleLayout = await createDomainObjectWithDefaults(page, { type: 'Flexible Layout' });
-
-    // Create Example Imagery inside the Flexible Layout
-    await createDomainObjectWithDefaults(page, {
-      type: 'Example Imagery',
-      parent: flexibleLayout.uuid
-    });
-
-    // Navigate back to Flexible Layout
-    await page.goto(flexibleLayout.url);
-  });
-
-  test('Can double-click on the image to view large image', async ({ page }) => {
-    // Double-click on the image to open large view
-    const imageElement = await page.getByRole('button', { name: 'Image Wrapper' });
-    await imageElement.dblclick();
-
-    // Check if the large view is visible
-    await page.getByRole('button', { name: 'Background Image', state: 'visible' });
-
-    // Close the large view
-    await page.getByRole('button', { name: 'Close' }).click();
-  });
-
   test.beforeEach(async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
@@ -520,7 +468,7 @@ test.describe('Example Imagery in Flexible layout', () => {
 
     /* Create Sine Wave Generator with minimum Image Load Delay */
     // Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click text=Example Imagery
     await page.click('li[role="menuitem"]:has-text("Example Imagery")');
@@ -564,7 +512,7 @@ test.describe('Example Imagery in Tabs View', () => {
 
     /* Create Sine Wave Generator with minimum Image Load Delay */
     // Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click text=Example Imagery
     await page.click('li[role="menuitem"]:has-text("Example Imagery")');
@@ -607,7 +555,6 @@ test.describe('Example Imagery in Time Strip', () => {
     // Navigate to timestrip
     await page.goto(timeStripObject.url);
   });
-
   test('Clicking a thumbnail loads the image in large view', async ({ page, browserName }) => {
     test.info().annotations.push({
       type: 'issue',
@@ -1012,7 +959,7 @@ async function resetImageryPanAndZoom(page) {
  */
 async function createImageryView(page) {
   // Click the Create button
-  await page.getByRole('button', { name: 'Create' }).click();
+  await page.click('button:has-text("Create")');
 
   // Click text=Example Imagery
   await page.click('li[role="menuitem"]:has-text("Example Imagery")');

e2e/tests/functional/features/importAndExportAsJSON/exportAsJson.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,29 +20,40 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/**
- * This test is dedicated to test conditional styling
- */
+/*
+This test suite is dedicated to tests which verify the basic operations surrounding exportAsJSON.
+*/
 
-import { test } from '../../../../pluginFixtures.js';
+// FIXME: Remove this eslint exception once tests are implemented
+// eslint-disable-next-line no-unused-vars
+const { test, expect } = require('../../../../baseFixtures');
 
-test.describe('Conditional Styling', () => {
+test.describe('ExportAsJSON', () => {
   test.fixme(
-    'Conditional Styling can be applied to Flex Layout and its children',
+    'Create a basic object and verify that it can be exported as JSON from Tree',
     async ({ page }) => {
-      //test
+      //Create domain object
+      //Save Domain Object
+      //Verify that the newly created domain object can be exported as JSON from the Tree
     }
   );
   test.fixme(
-    'Conditional Styling can be applied to Overlay Plot and its children',
+    'Create a basic object and verify that it can be exported as JSON from 3 dot menu',
     async ({ page }) => {
-      //test
+      //Create domain object
+      //Save Domain Object
+      //Verify that the newly created domain object can be exported as JSON from the 3 dot menu
     }
   );
+  test.fixme('Verify that a nested Object can be exported as JSON', async ({ page }) => {
+    // Create 2 objects with hierarchy
+    // Export as JSON
+    // Verify Hierarchy
+  });
   test.fixme(
-    'Conditional Styling changes the styling of the object the condition changes state',
+    'Verify that the ExportAsJSON dropdown does not appear for the item X',
     async ({ page }) => {
-      //test
+      // Other than non-persistable objects
     }
   );
 });

e2e/tests/functional/features/importAndExportAsJSON/importAsJson.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -26,7 +26,7 @@ This test suite is dedicated to tests which verify the basic operations surround
 
 // FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('ExportAsJSON', () => {
   test.fixme('Verify that domain object can be importAsJSON from Tree', async ({ page }) => {

e2e/tests/functional/features/inspectorDataVisualization/numericData.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,24 +19,22 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* global __dirname */
 
-import { fileURLToPath } from 'url';
-
-import { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const path = require('path');
 
 test.describe('Testing numeric data with inspector data visualization (i.e., data pivoting)', () => {
   test.beforeEach(async ({ page }) => {
     // eslint-disable-next-line no-undef
     await page.addInitScript({
-      path: fileURLToPath(
-        new URL('../../../../helper/addInitDataVisualization.js', import.meta.url)
-      )
+      path: path.join(__dirname, '../../../../helper/', 'addInitDataVisualization.js')
     });
     await page.goto('./', { waitUntil: 'domcontentloaded' });
   });
 
-  test('Can click on telemetry and see data in inspector @2p', async ({ page, context }) => {
+  test('Can click on telemetry and see data in inspector', async ({ page }) => {
     const exampleDataVisualizationSource = await createDomainObjectWithDefaults(page, {
       type: 'Example Data Visualization Source'
     });
@@ -67,16 +65,5 @@ test.describe('Testing numeric data with inspector data visualization (i.e., dat
       page.locator('span.plot-series-name', { hasText: 'Second Sine Wave Generator Hz' })
     ).toBeVisible();
     await expect(page.locator('.js-series-data-loaded')).toBeVisible();
-
-    // test new tab
-    await page.getByLabel('Inspector Views').getByLabel('More actions').click();
-    const pagePromise = context.waitForEvent('page');
-    await page.getByRole('menuitem', { name: /Open In New Tab/ }).click();
-
-    // ensure our new tab's title is correct
-    const newPage = await pagePromise;
-    await newPage.waitForLoadState();
-    // expect new tab title to contain 'Second Sine Wave Generator'
-    await expect(newPage).toHaveTitle('Second Sine Wave Generator');
   });
 });

e2e/tests/functional/features/lad/lad.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,14 +20,14 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {
+const { test, expect } = require('../../../../pluginFixtures');
+const {
   createDomainObjectWithDefaults,
-  openObjectTreeContextMenu,
+  setStartOffset,
   setFixedTimeMode,
   setRealTimeMode,
-  setStartOffset
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+  openObjectTreeContextMenu
+} = require('../../../../appActions');
 
 test.describe('Testing LAD table configuration', () => {
   let ladTable;
@@ -52,13 +52,13 @@ test.describe('Testing LAD table configuration', () => {
   });
   test('in edit mode, LAD Tables provide ability to hide columns', async ({ page }) => {
     // Edit LAD table
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
     await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
 
     // make sure headers are visible initially
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -66,10 +66,10 @@ test.describe('Testing LAD table configuration', () => {
     await expect(page.getByRole('cell', { name: 'SEVERE' })).toBeVisible();
 
     // hide timestamp column
-    await page.getByLabel('Timestamp', { exact: true }).uncheck();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeHidden();
+    await page.getByLabel('Timestamp').uncheck();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -78,10 +78,10 @@ test.describe('Testing LAD table configuration', () => {
 
     // hide units & type column
     await page.getByLabel('Units').uncheck();
-    await page.getByLabel('Type', { exact: true }).uncheck();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeHidden();
+    await page.getByLabel('Type').uncheck();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -90,9 +90,9 @@ test.describe('Testing LAD table configuration', () => {
 
     // hide WATCH column
     await page.getByLabel('WATCH').uncheck();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -103,9 +103,9 @@ test.describe('Testing LAD table configuration', () => {
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
     await page.reload();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -113,14 +113,14 @@ test.describe('Testing LAD table configuration', () => {
     await expect(page.getByRole('cell', { name: 'SEVERE' })).toBeVisible();
 
     // Edit LAD table
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
     await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
 
     // show timestamp column
-    await page.getByLabel('Timestamp', { exact: true }).check();
+    await page.getByLabel('Timestamp').check();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -132,8 +132,8 @@ test.describe('Testing LAD table configuration', () => {
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
     await page.reload();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeHidden();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -141,16 +141,16 @@ test.describe('Testing LAD table configuration', () => {
     await expect(page.getByRole('cell', { name: 'SEVERE' })).toBeVisible();
 
     // Edit LAD table
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
     await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
 
     // show units, type, and WATCH columns
     await page.getByLabel('Units').check();
-    await page.getByLabel('Type', { exact: true }).check();
+    await page.getByLabel('Type').check();
     await page.getByLabel('WATCH').check();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -161,9 +161,9 @@ test.describe('Testing LAD table configuration', () => {
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
     await page.reload();
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -181,13 +181,13 @@ test.describe('Testing LAD table configuration', () => {
     await page.goto(ladTable.url);
 
     // Edit LAD table
-    await page.getByLabel('Edit Object').click();
+    await page.getByLabel('Edit').click();
     await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
 
     // make sure Sine Wave headers are visible initially too
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'DISTRESS' })).toBeVisible();
@@ -198,16 +198,16 @@ test.describe('Testing LAD table configuration', () => {
     await page.getByLabel('Save').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
-    // Remove Sine Wave Generator
+    // Remove Sin Wave Generator
     openObjectTreeContextMenu(page, sineWaveObject.url);
     await page.getByRole('menuitem', { name: /Remove/ }).click();
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
+    await page.getByRole('button', { name: 'OK' }).click();
 
     // Ensure Units & Limit columns are gone
     // as Event Generator don't have them
     await page.goto(ladTable.url);
-    await expect(page.getByRole('cell', { name: 'Timestamp', exact: true })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Type', exact: true })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
     await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WATCH' })).toBeHidden();
     await expect(page.getByRole('cell', { name: 'WARNING' })).toBeHidden();
@@ -258,7 +258,7 @@ test.describe('Testing LAD table @unstable', () => {
       name: 'Test LAD Table'
     });
     // Edit LAD table
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
@@ -286,7 +286,7 @@ test.describe('Testing LAD table @unstable', () => {
       name: 'Test LAD Table'
     });
     // Edit LAD table
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();

e2e/tests/functional/features/menu.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,20 +19,20 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify persistability checks
 */
 
-import { fileURLToPath } from 'url';
+const { test, expect } = require('../../baseFixtures.js');
 
-import { expect, test } from '../../baseFixtures.js';
+const path = require('path');
 
 test.describe('Persistence operations @addInit', () => {
   // add non persistable root item
   test.beforeEach(async ({ page }) => {
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addNoneditableObject.js', import.meta.url))
+      path: path.join(__dirname, '../../helper', 'addNoneditableObject.js')
     });
   });
 

e2e/tests/functional/features/moveAndLinkObjects.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 This test suite is dedicated to tests which verify the basic operations surrounding moving & linking objects.
 */
 
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
 
 test.describe('Move & link item tests', () => {
   test('Create a basic object and verify that it can be moved to another folder', async ({

e2e/tests/functional/features/notebook/notebook.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,16 +19,15 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
 */
 
-import { fileURLToPath } from 'url';
-
-import { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import * as nbUtils from '../../../../helper/notebookUtils.js';
-import { expect, streamToString, test } from '../../../../pluginFixtures.js';
+const { test, expect, streamToString } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const nbUtils = require('../../../../helper/notebookUtils');
+const path = require('path');
 
 const NOTEBOOK_NAME = 'Notebook';
 
@@ -247,7 +246,7 @@ test.describe('Notebook export tests', () => {
   test('can export notebook as text', async ({ page }) => {
     await nbUtils.enterTextEntry(page, `Foo bar entry`);
     // Click on 3 Dot Menu
-    await page.locator('button[title="More actions"]').click();
+    await page.locator('button[title="More options"]').click();
     const downloadPromise = page.waitForEvent('download');
 
     await page.getByRole('menuitem', { name: /Export Notebook as Text/ }).click();
@@ -279,7 +278,7 @@ test.describe('Notebook entry tests', () => {
   test.beforeEach(async ({ page }) => {
     // eslint-disable-next-line no-undef
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../../../helper/addInitNotebookWithUrls.js', import.meta.url))
+      path: path.join(__dirname, '../../../../helper/', 'addInitNotebookWithUrls.js')
     });
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 

e2e/tests/functional/features/notebook/notebookSnapshots.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,12 +19,17 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
 */
 
-import { expect, test } from '../../../../pluginFixtures.js';
+const fs = require('fs').promises;
+const path = require('path');
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+
+const NOTEBOOK_NAME = 'Notebook';
 
 test.describe('Snapshot Menu tests', () => {
   test.fixme(
@@ -83,19 +88,23 @@ test.describe('Snapshot Container tests', () => {
     //     name: "Dropped Overlay Plot"
     // });
 
-    await page.getByLabel('Take a Notebook Snapshot').click();
-    await page.getByRole('menuitem', { name: 'Save to Notebook Snapshots' }).click();
-    await page.getByLabel('Show Snapshots').click();
-  });
-  test('A snapshot can be Quick Viewed from Container with 3 dot action menu', async ({ page }) => {
-    await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More actions').click();
-    await page.getByRole('menuitem', { name: 'Quick View' }).click();
-    await expect(page.locator('.c-overlay__outer')).toBeVisible();
+    await page.getByRole('button', { name: ' Snapshot ' }).click();
+    await page.getByRole('menuitem', { name: ' Save to Notebook Snapshots' }).click();
+    await page.getByRole('button', { name: 'Show' }).click();
   });
+  test.fixme('5 Snapshots can be added to a container', async ({ page }) => {});
+  test.fixme(
+    '5 Snapshots can be added to a container and Deleted with Delete All action',
+    async ({ page }) => {}
+  );
+  test.fixme(
+    'A snapshot can be Deleted from Container with 3 dot action menu',
+    async ({ page }) => {}
+  );
   test.fixme(
     'A snapshot can be Viewed, Annotated, display deleted, and saved from Container with 3 dot action menu',
     async ({ page }) => {
-      await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More actions').click();
+      await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
       await page.getByRole('menuitem', { name: ' View Snapshot' }).click();
       await expect(page.locator('.c-overlay__outer')).toBeVisible();
       await page.getByTitle('Annotate').click();
@@ -107,15 +116,11 @@ test.describe('Snapshot Container tests', () => {
       //await expect(await page.locator)
     }
   );
-  test.fixme('5 Snapshots can be added to a container', async ({ page }) => {});
-  test.fixme(
-    '5 Snapshots can be added to a container and Deleted with Delete All action',
-    async ({ page }) => {}
-  );
-  test.fixme(
-    'A snapshot can be Deleted from Container with 3 dot action menu',
-    async ({ page }) => {}
-  );
+  test('A snapshot can be Quick Viewed from Container with 3 dot action menu', async ({ page }) => {
+    await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
+    await page.getByRole('menuitem', { name: 'Quick View' }).click();
+    await expect(page.locator('.c-overlay__outer')).toBeVisible();
+  });
   test.fixme(
     'A snapshot can be Navigated To from Container with 3 dot action menu',
     async ({ page }) => {}
@@ -159,3 +164,115 @@ test.describe('Snapshot Container tests', () => {
     }
   );
 });
+
+test.describe('Snapshot image tests', () => {
+  test.beforeEach(async ({ page }) => {
+    //Navigate to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Create Notebook
+    await createDomainObjectWithDefaults(page, {
+      type: NOTEBOOK_NAME
+    });
+  });
+
+  test('Can drop an image onto a notebook and create a new entry', async ({ page }) => {
+    const imageData = await fs.readFile(
+      path.resolve(__dirname, '../../../../../src/images/favicons/favicon-96x96.png')
+    );
+    const imageArray = new Uint8Array(imageData);
+    const fileData = Array.from(imageArray);
+
+    const dropTransfer = await page.evaluateHandle((data) => {
+      const dataTransfer = new DataTransfer();
+      const file = new File([new Uint8Array(data)], 'favicon-96x96.png', { type: 'image/png' });
+      dataTransfer.items.add(file);
+      return dataTransfer;
+    }, fileData);
+
+    await page.dispatchEvent('.c-notebook__drag-area', 'drop', { dataTransfer: dropTransfer });
+    await page.locator('.c-ne__save-button > button').click();
+    // be sure that entry was created
+    await expect(page.getByText('favicon-96x96.png')).toBeVisible();
+
+    await page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).click();
+    // expect large image to be displayed
+    await expect(page.getByRole('dialog').getByText('favicon-96x96.png')).toBeVisible();
+
+    await page.getByLabel('Close').click();
+
+    // drop another image onto the entry
+    await page.dispatchEvent('.c-snapshots', 'drop', { dataTransfer: dropTransfer });
+
+    const secondThumbnail = page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).nth(1);
+    await secondThumbnail.waitFor({ state: 'attached' });
+    // expect two embedded images now
+    expect(await page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).count()).toBe(2);
+
+    await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
+
+    await page.getByRole('menuitem', { name: /Remove This Embed/ }).click();
+    await page.getByRole('button', { name: 'Ok', exact: true }).click();
+    // Ensure that the thumbnail is removed before we assert
+    await secondThumbnail.waitFor({ state: 'detached' });
+
+    // expect one embedded image now as we deleted the other
+    expect(await page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).count()).toBe(1);
+  });
+});
+
+test.describe('Snapshot image failure tests', () => {
+  test.use({ failOnConsoleError: false });
+  test.beforeEach(async ({ page }) => {
+    //Navigate to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Create Notebook
+    await createDomainObjectWithDefaults(page, {
+      type: NOTEBOOK_NAME
+    });
+  });
+
+  test('Get an error notification when dropping unknown file onto notebook entry', async ({
+    page
+  }) => {
+    // fill Uint8Array array with some garbage data
+    const garbageData = new Uint8Array(100);
+    const fileData = Array.from(garbageData);
+
+    const dropTransfer = await page.evaluateHandle((data) => {
+      const dataTransfer = new DataTransfer();
+      const file = new File([new Uint8Array(data)], 'someGarbage.foo', { type: 'unknown/garbage' });
+      dataTransfer.items.add(file);
+      return dataTransfer;
+    }, fileData);
+
+    await page.dispatchEvent('.c-notebook__drag-area', 'drop', { dataTransfer: dropTransfer });
+
+    // should have gotten a notification from OpenMCT that we couldn't add it
+    await expect(page.getByText('Unknown object(s) dropped and cannot embed')).toBeVisible();
+  });
+
+  test('Get an error notification when dropping big files onto notebook entry', async ({
+    page
+  }) => {
+    const garbageSize = 15 * 1024 * 1024; // 15 megabytes
+
+    await page.addScriptTag({
+      // make the garbage client side
+      content: `window.bigGarbageData = new Uint8Array(${garbageSize})`
+    });
+
+    const bigDropTransfer = await page.evaluateHandle(() => {
+      const dataTransfer = new DataTransfer();
+      const file = new File([window.bigGarbageData], 'bigBoy.png', { type: 'image/png' });
+      dataTransfer.items.add(file);
+      return dataTransfer;
+    });
+
+    await page.dispatchEvent('.c-notebook__drag-area', 'drop', { dataTransfer: bigDropTransfer });
+
+    // should have gotten a notification from OpenMCT that we couldn't add it as it's too big
+    await expect(page.getByText('unable to embed')).toBeVisible();
+  });
+});

e2e/tests/functional/features/notebook/notebookWithCouchDB.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,9 +24,9 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks with CouchDB.
 */
 
-import { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import * as nbUtils from '../../../../helper/notebookUtils.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const nbUtils = require('../../../../helper/notebookUtils');
 
 test.describe('Notebook Tests with CouchDB @couchdb', () => {
   let testNotebook;
@@ -185,20 +185,16 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
     await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
     //Partial match for "Science" should only return Science
     await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
-    await expect(page.locator('[aria-label="Annotation Search Result"]').first()).toContainText(
-      'Science'
-    );
-    await expect(page.locator('[aria-label="Annotation Search Result"]').first()).not.toContainText(
-      'Driving'
-    );
-    await expect(page.locator('[aria-label="Annotation Search Result"]').first()).not.toContainText(
+    await expect(page.locator('[aria-label="Search Result"]').first()).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]').first()).not.toContainText('Driving');
+    await expect(page.locator('[aria-label="Search Result"]').first()).not.toContainText(
       'Drilling'
     );
 
     //Searching for a tag which does not exist should return an empty result
     await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
     await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Xq');
-    await expect(page.getByText('No results found')).toBeVisible();
+    await expect(page.locator('text=No results found')).toBeVisible();
   });
 });
 

e2e/tests/functional/features/notebook/restrictedNotebook.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,14 +20,14 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { openObjectTreeContextMenu } from '../../../../appActions.js';
-import {
+const { test, expect, streamToString } = require('../../../../pluginFixtures');
+const { openObjectTreeContextMenu } = require('../../../../appActions');
+const {
+  lockPage,
   dragAndDropEmbed,
   enterTextEntry,
-  lockPage,
   startAndAddRestrictedNotebookObject
-} from '../../../../helper/notebookUtils.js';
-import { expect, streamToString, test } from '../../../../pluginFixtures.js';
+} = require('../../../../helper/notebookUtils');
 
 const TEST_TEXT = 'Testing text for entries.';
 const TEST_TEXT_NAME = 'Test Page';
@@ -152,18 +152,18 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit
 
   test('Allows embeds to be deleted if page unlocked @addInit', async ({ page }) => {
     // Click embed popup menu
-    await page.getByLabel('Notebook Entry').getByLabel('More actions').click();
+    await page.locator('.c-ne__embed__name .c-icon-button').click();
 
-    const embedMenu = page.getByLabel('Super Menu');
+    const embedMenu = page.locator('body >> .c-menu');
     await expect(embedMenu).toContainText('Remove This Embed');
   });
 
   test('Disallows embeds to be deleted if page locked @addInit', async ({ page }) => {
     await lockPage(page);
     // Click embed popup menu
-    await page.getByLabel('Notebook Entry').getByLabel('More actions').click();
+    await page.locator('.c-ne__embed__name .c-icon-button').click();
 
-    const embedMenu = page.getByLabel('Super Menu');
+    const embedMenu = page.locator('body >> .c-menu');
     await expect(embedMenu).not.toContainText('Remove This Embed');
   });
 });
@@ -176,7 +176,7 @@ test.describe('can export restricted notebook as text', () => {
   test('basic functionality ', async ({ page }) => {
     await enterTextEntry(page, `Foo bar entry`);
     // Click on 3 Dot Menu
-    await page.locator('button[title="More actions"]').click();
+    await page.locator('button[title="More options"]').click();
     const downloadPromise = page.waitForEvent('download');
 
     await page.getByRole('menuitem', { name: /Export Notebook as Text/ }).click();

e2e/tests/functional/features/notebook/tags.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,13 +24,13 @@
 This test suite is dedicated to tests which verify notebook tag functionality.
 */
 
-import { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import {
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const {
+  enterTextEntry,
   createNotebookAndEntry,
-  createNotebookEntryAndTags,
-  enterTextEntry
-} from '../../../../helper/notebookUtils.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+  createNotebookEntryAndTags
+} = require('../../../../helper/notebookUtils');
 
 test.describe('Tagging in Notebooks @addInit', () => {
   test.beforeEach(async ({ page }) => {
@@ -88,53 +88,43 @@ test.describe('Tagging in Notebooks @addInit', () => {
 
     await page.locator('[placeholder="Type to select tag"]').click();
 
-    await page.getByRole('search').getByLabel('Search Input').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
 
     await expect(page.locator('button:has-text("Add Tag")')).toBeVisible();
 
     // Test canceling adding a tag after we just click "Add Tag"
     await page.locator('button:has-text("Add Tag")').click();
 
-    await page.getByRole('search').getByLabel('Search Input').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
 
     await expect(page.locator('button:has-text("Add Tag")')).toBeVisible();
   });
   test('Can search for tags and preview works properly', async ({ page }) => {
     await createNotebookEntryAndTags(page);
-    await page.getByRole('search').getByLabel('Search Input').click();
-    await page.getByRole('search').getByLabel('Search Input').fill('sc');
-    await expect(page.getByRole('listitem', { name: 'Annotation Search Result' })).toContainText(
-      'Science'
-    );
-    await expect(
-      page.getByRole('listitem', { name: 'Annotation Search Result' })
-    ).not.toContainText('Driving');
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
+    await expect(page.locator('[aria-label="Search Result"]')).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]')).not.toContainText('Driving');
 
-    await page.getByRole('search').getByLabel('Search Input').click();
-    await page.getByRole('search').getByLabel('Search Input').fill('Sc');
-    await expect(page.getByRole('listitem', { name: 'Annotation Search Result' })).toContainText(
-      'Science'
-    );
-    await expect(
-      page.getByRole('listitem', { name: 'Annotation Search Result' })
-    ).not.toContainText('Driving');
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
+    await expect(page.locator('[aria-label="Search Result"]')).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]')).not.toContainText('Driving');
 
-    await page.getByRole('search').getByLabel('Search Input').click();
-    await page.getByRole('search').getByLabel('Search Input').fill('Xq');
-    await expect(page.getByText('No results found')).toBeVisible();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Xq');
+    await expect(page.locator('text=No results found')).toBeVisible();
 
     await createDomainObjectWithDefaults(page, {
       type: 'Display Layout'
     });
 
     // Go back into edit mode for the display layout
-    await page.getByRole('button', { name: 'Edit Object' }).click();
+    await page.locator('button[title="Edit"]').click();
 
-    await page.getByRole('search').getByLabel('Search Input').click();
-    await page.getByRole('search').getByLabel('Search Input').fill('Sc');
-    await expect(page.getByRole('listitem', { name: 'Annotation Search Result' })).toContainText(
-      'Science'
-    );
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
+    await expect(page.locator('[aria-label="Search Result"]')).toContainText('Science');
     await page.getByText('Entry 0').click();
     await expect(page.locator('.js-preview-window')).toBeVisible();
   });
@@ -148,10 +138,8 @@ test.describe('Tagging in Notebooks @addInit', () => {
     await expect(page.locator('[aria-label="Tags Inspector"]')).toContainText('Science');
     await expect(page.locator('[aria-label="Tags Inspector"]')).not.toContainText('Driving');
 
-    await page.getByRole('search').getByLabel('Search Input').fill('sc');
-    await expect(
-      page.getByRole('listitem', { name: 'Annotation Search Result' })
-    ).not.toContainText('Driving');
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
+    await expect(page.locator('[aria-label="Search Result"]')).not.toContainText('Driving');
   });
 
   test('Can delete entries without tags', async ({ page }) => {
@@ -179,17 +167,17 @@ test.describe('Tagging in Notebooks @addInit', () => {
   test('Can delete objects with tags and neither return in search', async ({ page }) => {
     await createNotebookEntryAndTags(page);
     // Delete Notebook
-    await page.locator('button[title="More actions"]').click();
+    await page.locator('button[title="More options"]').click();
     await page.locator('li[title="Remove this object from its containing object."]').click();
     await page.locator('button:has-text("OK")').click();
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('search').getByLabel('Search Input').fill('Unnamed');
-    await expect(page.getByText('No results found')).toBeVisible();
-    await page.getByRole('search').getByLabel('Search Input').fill('sci');
-    await expect(page.getByText('No results found')).toBeVisible();
-    await page.getByRole('search').getByLabel('Search Input').fill('dri');
-    await expect(page.getByText('No results found')).toBeVisible();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Unnamed');
+    await expect(page.locator('text=No results found')).toBeVisible();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sci');
+    await expect(page.locator('text=No results found')).toBeVisible();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('dri');
+    await expect(page.locator('text=No results found')).toBeVisible();
   });
   test('Tags persist across reload', async ({ page }) => {
     //Go to baseURL

e2e/tests/functional/features/notification.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 This test suite is dedicated to tests which verify Open MCT's Notification functionality
 */
 
-import { createDomainObjectWithDefaults, createNotification } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { createDomainObjectWithDefaults, createNotification } = require('../../appActions');
+const { test, expect } = require('../../pluginFixtures');
 
 test.describe('Notifications List', () => {
   test.fixme('Notifications can be dismissed individually', async ({ page }) => {
@@ -91,30 +91,27 @@ test.describe('Notification Overlay', () => {
     // Create a new Display Layout object
     await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
 
-    // Dismiss notification banner
-    await page.getByRole('button', { name: 'Dismiss' }).click();
-
     // Click on the button "Review 1 Notification"
-    await page.getByRole('button', { name: 'Review 1 Notification' }).click();
+    await page.click('button[aria-label="Review 1 Notification"]');
 
     // Verify that Notification List is open
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toBeVisible();
+    expect(await page.locator('div[role="dialog"]').isVisible()).toBe(true);
 
     // Wait until there is no Notification Banner
-    await expect(page.getByRole('alert')).not.toBeAttached();
+    await page.waitForSelector('div[role="alert"]', { state: 'detached' });
 
     // Click on the "Close" button of the Notification List
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.click('button[aria-label="Close"]');
 
     // On the Display Layout object, click on the "Edit" button
-    await page.getByRole('button', { name: 'Edit Object' }).click();
+    await page.click('button[title="Edit"]');
 
     // Click on the "Save" button
-    await page.getByRole('button', { name: 'Save' }).click();
+    await page.click('button[title="Save"]');
 
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
     // Verify that Notification List is NOT open
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toBeHidden();
+    expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
   });
 });

e2e/tests/functional/features/operatorStatus/operatorStatus.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,13 +19,13 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* global __dirname */
 /*
  * This test suite is dedicated to testing the operator status plugin.
  */
 
-import { fileURLToPath } from 'url';
-
-import { expect, test } from '../../../../pluginFixtures.js';
+const path = require('path');
+const { test, expect } = require('../../../../pluginFixtures');
 
 /*
 
@@ -41,17 +41,17 @@ test.describe('Operator Status', () => {
   test.beforeEach(async ({ page }) => {
     // FIXME: determine if plugins will be added to index.html or need to be injected
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../../../helper/addInitExampleUser.js', import.meta.url))
+      path: path.join(__dirname, '../../../../helper/', 'addInitExampleUser.js')
     });
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../../../helper/addInitOperatorStatus.js', import.meta.url))
+      path: path.join(__dirname, '../../../../helper/', 'addInitOperatorStatus.js')
     });
     await page.goto('./', { waitUntil: 'domcontentloaded' });
     await expect(page.getByText('Select Role')).toBeVisible();
     // Description should be empty https://github.com/nasa/openmct/issues/6978
     await expect(page.locator('.c-message__action-text')).toBeHidden();
     // set role
-    await page.getByRole('button', { name: 'Select', exact: true }).click();
+    await page.getByRole('button', { name: 'Select' }).click();
     // dismiss role confirmation popup
     await page.getByRole('button', { name: 'Dismiss' }).click();
   });

e2e/tests/functional/features/plot/autoscale.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 Testsuite for plot autoscale.
 */
 
-import { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const { test, expect } = require('../../../../pluginFixtures');
 test.use({
   viewport: {
     width: 1280,
@@ -58,7 +58,7 @@ test.describe('Autoscale', () => {
     await testYTicks(page, ['-1.00', '-0.50', '0.00', '0.50', '1.00']);
 
     // enter edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.click('button[title="Edit"]');
 
     await page.getByRole('tab', { name: 'Config' }).click();
     await turnOffAutoscale(page);

e2e/tests/functional/features/plot/logPlot.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,8 +25,8 @@ Tests to verify log plot functionality. Note this test suite if very much under
 necessarily be used for reference when writing new tests in this area.
 */
 
-import { setTimeConductorBounds } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures');
+const { setTimeConductorBounds } = require('../../../../appActions');
 
 test.describe('Log plot tests', () => {
   test('Log Plot ticks are functionally correct in regular and log mode and after refresh', async ({
@@ -95,15 +95,18 @@ async function makeOverlayPlot(page, myItemsFolderName) {
 
   await page.locator('button.c-create-button').click();
   await page.locator('li[role="menuitem"]:has-text("Overlay Plot")').click();
-  // Click OK button and wait for Navigate event
   await Promise.all([
-    page.waitForLoadState(),
-    await page.getByRole('button', { name: 'Save' }).click(),
-    // Wait for Save Banner to appear
+    page.waitForNavigation({ waitUntil: 'networkidle' }),
+    page.locator('button:has-text("OK")').click(),
+    //Wait for Save Banner to appear
     page.waitForSelector('.c-message-banner__message')
   ]);
+  //Wait until Save Banner is gone
+  await page.locator('.c-message-banner__close-button').click();
+  await page.waitForSelector('.c-message-banner__message', { state: 'detached' });
 
   // save the overlay plot
+
   await saveOverlayPlot(page);
 
   // create a sinewave generator
@@ -111,24 +114,34 @@ async function makeOverlayPlot(page, myItemsFolderName) {
   await page.locator('button.c-create-button').click();
   await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
 
-  // set amplitude to 6, offset 4, data rate 2 hz
+  // set amplitude to 6, offset 4, period 2
 
-  await page.getByLabel('Amplitude').fill('6');
-  await page.getByLabel('Offset').fill('4');
-  await page.getByLabel('Data Rate (hz)').fill('2');
+  await page.locator('div:nth-child(5) .c-form-row__controls .form-control .field input').click();
+  await page.locator('div:nth-child(5) .c-form-row__controls .form-control .field input').fill('6');
+
+  await page.locator('div:nth-child(6) .c-form-row__controls .form-control .field input').click();
+  await page.locator('div:nth-child(6) .c-form-row__controls .form-control .field input').fill('4');
+
+  await page.locator('div:nth-child(7) .c-form-row__controls .form-control .field input').click();
+  await page.locator('div:nth-child(7) .c-form-row__controls .form-control .field input').fill('2');
+
+  // Click OK to make generator
 
-  // Click OK button and wait for Navigate event
   await Promise.all([
-    page.waitForLoadState(),
-    await page.getByRole('button', { name: 'Save' }).click(),
-    // Wait for Save Banner to appear
+    page.waitForNavigation({ waitUntil: 'networkidle' }),
+    page.locator('button:has-text("OK")').click(),
+    //Wait for Save Banner to appear
     page.waitForSelector('.c-message-banner__message')
   ]);
+  //Wait until Save Banner is gone
+  await page.locator('.c-message-banner__close-button').click();
+  await page.waitForSelector('.c-message-banner__message', { state: 'detached' });
 
   // click on overlay plot
+
   await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
   await Promise.all([
-    page.waitForLoadState(),
+    page.waitForNavigation(),
     page.locator('text=Unnamed Overlay Plot').first().click()
   ]);
 }
@@ -170,7 +183,7 @@ async function testLogTicks(page) {
  */
 async function enableEditMode(page) {
   // turn on edit mode
-  await page.getByRole('button', { name: 'Edit Object' }).click();
+  await page.getByRole('button', { name: 'Edit' }).click();
   await expect(page.getByRole('button', { name: 'Save' })).toBeVisible();
 }
 

e2e/tests/functional/features/plot/missingPlotObj.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,7 +24,7 @@
 Tests to verify log plot functionality when objects are missing
 */
 
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures');
 
 test.describe('Handle missing object for plots', () => {
   test('Displays empty div for missing stacked plot item @unstable', async ({