debug

* Clean up imagery tests, fix display layout test

(cherry picked from commit 7d6699fcecb34cf98bac4aa8f9a1b2996736325c)

* Code review comments, more cleanup

* Add Tabs View suite, extract common actions to functions

* Add missing await

* remove unnecessary wait

* lint

* [e2e] playwright v1.25.0 -->v1.25.2

Co-authored-by: John Hill <john.c.hill@nasa.gov>

.circleci/config.yml

@@ -2,10 +2,11 @@ version: 2.1
 executors:
   pw-focal-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.23.0-focal
+      - image: mcr.microsoft.com/playwright:v1.25.2-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)
 parameters:
   BUST_CACHE:
     description: "Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!"

.github/workflows/e2e-couchdb.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
-      - run: npx playwright@1.23.0 install
+      - run: npx playwright@1.25.2 install
       - run: npm install
       - run: sh src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
       - run: npm run test:e2e:couchdb

.github/workflows/e2e-pr.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
-      - run: npx playwright@1.23.0 install
+      - run: npx playwright@1.25.2 install
       - run: npx playwright install chrome-beta
       - run: npm install
       - run: npm run test:e2e:full

e2e/appActions.js

@@ -45,6 +45,8 @@
  * @property {string} url the relative url to the object (for use with `page.goto()`)
  */
 
+const Buffer = require('buffer').Buffer;
+
 /**
  * This common function creates a domain object with the default options. It is the preferred way of creating objects
  * in the e2e suite when uninterested in properties of the objects themselves.
@@ -100,6 +102,59 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
     };
 }
 
+/**
+ * Create a Plan object from JSON with the provided options.
+ * @param {import('@playwright/test').Page} page
+ * @param {*} options
+ * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
+ */
+async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
+    const parentUrl = await getHashUrlToDomainObject(page, parent);
+
+    // Navigate to the parent object. This is necessary to create the object
+    // in the correct location, such as a folder, layout, or plot.
+    await page.goto(`${parentUrl}?hideTree=true`);
+
+    //Click the Create button
+    await page.click('button:has-text("Create")');
+
+    // Click 'Plan' menu option
+    await page.click(`li:text("Plan")`);
+
+    // Modify the name input field of the domain object to accept 'name'
+    if (name) {
+        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+        await nameInput.fill("");
+        await nameInput.fill(name);
+    }
+
+    // Upload buffer from memory
+    await page.locator('input#fileElem').setInputFiles({
+        name: 'plan.txt',
+        mimeType: 'text/plain',
+        buffer: Buffer.from(JSON.stringify(json))
+    });
+
+    // Click OK button and wait for Navigate event
+    await Promise.all([
+        page.waitForLoadState(),
+        page.click('[aria-label="Save"]'),
+        // Wait for Save Banner to appear
+        page.waitForSelector('.c-message-banner__message')
+    ]);
+
+    // Wait until the URL is updated
+    await page.waitForURL(`**/mine/*`);
+    const uuid = await getFocusedObjectUuid(page);
+    const objectUrl = await getHashUrlToDomainObject(page, uuid);
+
+    return {
+        uuid,
+        name,
+        url: objectUrl
+    };
+}
+
 /**
 * Open the given `domainObject`'s context menu from the object tree.
 * Expands the path to the object and scrolls to it if necessary.
@@ -258,6 +313,7 @@ async function setEndOffset(page, offset) {
 // eslint-disable-next-line no-undef
 module.exports = {
     createDomainObjectWithDefaults,
+    createPlanFromJSON,
     openObjectTreeContextMenu,
     getHashUrlToDomainObject,
     getFocusedObjectUuid,

e2e/playwright-visual.config.js

@@ -7,8 +7,9 @@ const config = {
     retries: 0, // visual tests should never retry due to snapshot comparison errors
     testDir: 'tests/visual',
     testMatch: '**/*.visual.spec.js', // only run visual tests
-    timeout: 60 * 1000,
-    workers: 2, //Limit to 2 for CircleCI Agent
+    timeout: 0,
+    workers: 1, //Limit to 2 for CircleCI Agent
+    repeatEach: 10,
     webServer: {
         command: 'cross-env NODE_ENV=test npm run start',
         url: 'http://localhost:8080/#',

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

@@ -42,7 +42,7 @@ test.describe('Persistence operations @addInit', () => {
             button: 'right'
         });
 
-        const menuOptions = page.locator('.c-menu ul');
+        const menuOptions = page.locator('.c-menu li');
 
         await expect.soft(menuOptions).toContainText(['Open In New Tab', 'View', 'Create Link']);
         await expect(menuOptions).not.toContainText(['Move', 'Duplicate', 'Remove', 'Add New Folder', 'Edit Properties...', 'Export as JSON', 'Import from JSON']);

e2e/tests/functional/planning/plan.e2e.spec.js

@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, 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.
+ *****************************************************************************/
+const { test, expect } = require('../../../pluginFixtures');
+const { createPlanFromJSON } = require('../../../appActions');
+
+const testPlan = {
+    "TEST_GROUP": [
+        {
+            "name": "Past event 1",
+            "start": 1660320408000,
+            "end": 1660343797000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 2",
+            "start": 1660406808000,
+            "end": 1660429160000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 3",
+            "start": 1660493208000,
+            "end": 1660503981000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 4",
+            "start": 1660579608000,
+            "end": 1660624108000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 5",
+            "start": 1660666008000,
+            "end": 1660681529000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        }
+    ]
+};
+
+test.describe("Plan", () => {
+    test("Create a Plan and display all plan events @unstable", async ({ page }) => {
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        const plan = await createPlanFromJSON(page, {
+            name: 'Test Plan',
+            json: testPlan
+        });
+        const startBound = testPlan.TEST_GROUP[0].start;
+        const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
+
+        // Switch to fixed time mode with all plan events within the bounds
+        await page.goto(`${plan.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=plan.view`);
+        const eventCount = await page.locator('.activity-bounds').count();
+        expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
+    });
+});
+

e2e/tests/functional/planning/timestrip.e2e.spec.js

@@ -0,0 +1,181 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, 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.
+ *****************************************************************************/
+
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults, createPlanFromJSON } = require('../../../appActions');
+
+const testPlan = {
+    "TEST_GROUP": [
+        {
+            "name": "Past event 1",
+            "start": 1660320408000,
+            "end": 1660343797000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 2",
+            "start": 1660406808000,
+            "end": 1660429160000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 3",
+            "start": 1660493208000,
+            "end": 1660503981000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 4",
+            "start": 1660579608000,
+            "end": 1660624108000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        },
+        {
+            "name": "Past event 5",
+            "start": 1660666008000,
+            "end": 1660681529000,
+            "type": "TEST-GROUP",
+            "color": "orange",
+            "textColor": "white"
+        }
+    ]
+};
+
+test.describe("Time Strip", () => {
+    test("Create two Time Strips, add a single Plan to both, and verify they can have separate Indepdenent Time Contexts @unstable", async ({ page }) => {
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/5627'
+        });
+
+        // Constant locators
+        const independentTimeConductorInputs = page.locator('.l-shell__main-independent-time-conductor .c-input--datetime');
+        const activityBounds = page.locator('.activity-bounds');
+
+        // Goto baseURL
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        const timestrip = await test.step("Create a Time Strip", async () => {
+            const createdTimeStrip = await createDomainObjectWithDefaults(page, { type: 'Time Strip' });
+            const objectName = await page.locator('.l-browse-bar__object-name').innerText();
+            expect(objectName).toBe(createdTimeStrip.name);
+
+            return createdTimeStrip;
+        });
+
+        const plan = await test.step("Create a Plan and add it to the timestrip", async () => {
+            const createdPlan = await createPlanFromJSON(page, {
+                name: 'Test Plan',
+                json: testPlan
+            });
+
+            await page.goto(timestrip.url);
+            // Expand the tree to show the plan
+            await page.click("button[title='Show selected item in tree']");
+            await page.dragAndDrop(`role=treeitem[name=/${createdPlan.name}/]`, '.c-object-view');
+            await page.click("button[title='Save']");
+            await page.click("li[title='Save and Finish Editing']");
+            const startBound = testPlan.TEST_GROUP[0].start;
+            const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
+
+            // Switch to fixed time mode with all plan events within the bounds
+            await page.goto(`${timestrip.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=time-strip.view`);
+
+            // Verify all events are displayed
+            const eventCount = await page.locator('.activity-bounds').count();
+            expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
+
+            return createdPlan;
+        });
+
+        await test.step("TimeStrip can use the Independent Time Conductor", async () => {
+            // Activate Independent Time Conductor in Fixed Time Mode
+            await page.click('.c-toggle-switch__slider');
+            expect(await activityBounds.count()).toEqual(0);
+
+            // Set the independent time bounds so that only one event is shown
+            const startBound = testPlan.TEST_GROUP[0].start;
+            const endBound = testPlan.TEST_GROUP[0].end;
+            const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
+            const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
+
+            await independentTimeConductorInputs.nth(0).fill('');
+            await independentTimeConductorInputs.nth(0).fill(startBoundString);
+            await page.keyboard.press('Enter');
+            await independentTimeConductorInputs.nth(1).fill('');
+            await independentTimeConductorInputs.nth(1).fill(endBoundString);
+            await page.keyboard.press('Enter');
+            expect(await activityBounds.count()).toEqual(1);
+        });
+
+        await test.step("Can have multiple TimeStrips with the same plan linked and different Independent Time Contexts", async () => {
+            // Create another Time Strip and verify that it has been created
+            const createdTimeStrip = await createDomainObjectWithDefaults(page, {
+                type: 'Time Strip',
+                name: "Another Time Strip"
+            });
+
+            const objectName = await page.locator('.l-browse-bar__object-name').innerText();
+            expect(objectName).toBe(createdTimeStrip.name);
+
+            // Drag the existing Plan onto the newly created Time Strip, and save.
+            await page.dragAndDrop(`role=treeitem[name=/${plan.name}/]`, '.c-object-view');
+            await page.click("button[title='Save']");
+            await page.click("li[title='Save and Finish Editing']");
+
+            // Activate Independent Time Conductor in Fixed Time Mode
+            await page.click('.c-toggle-switch__slider');
+
+            // All events should be displayed at this point because the
+            // initial independent context bounds will match the global bounds
+            expect(await activityBounds.count()).toEqual(5);
+
+            // Set the independent time bounds so that two events are shown
+            const startBound = testPlan.TEST_GROUP[0].start;
+            const endBound = testPlan.TEST_GROUP[1].end;
+            const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
+            const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
+
+            await independentTimeConductorInputs.nth(0).fill('');
+            await independentTimeConductorInputs.nth(0).fill(startBoundString);
+            await page.keyboard.press('Enter');
+            await independentTimeConductorInputs.nth(1).fill('');
+            await independentTimeConductorInputs.nth(1).fill(endBoundString);
+            await page.keyboard.press('Enter');
+
+            // Verify that two events are displayed
+            expect(await activityBounds.count()).toEqual(2);
+
+            // Switch to the previous Time Strip and verify that only one event is displayed
+            await page.goto(timestrip.url);
+            expect(await activityBounds.count()).toEqual(1);
+        });
+    });
+});

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

@@ -28,14 +28,14 @@ test.describe('The Fault Management Plugin using example faults', () => {
         await utils.navigateToFaultManagementWithExample(page);
     });
 
-    test('Shows a criticality icon for every fault', async ({ page }) => {
+    test('Shows a criticality icon for every fault @unstable', async ({ page }) => {
         const faultCount = await page.locator('c-fault-mgmt__list').count();
         const criticalityIconCount = await page.locator('c-fault-mgmt__list-severity').count();
 
         expect.soft(faultCount).toEqual(criticalityIconCount);
     });
 
-    test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector', async ({ page }) => {
+    test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector @unstable', async ({ page }) => {
         await utils.selectFaultItem(page, 1);
 
         const selectedFaultName = await page.locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname').textContent();
@@ -45,7 +45,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(inspectorFaultNameCount).toEqual(1);
     });
 
-    test('When selecting multiple faults, no specific fault information is shown in the inspector', async ({ page }) => {
+    test('When selecting multiple faults, no specific fault information is shown in the inspector @unstable', async ({ page }) => {
         await utils.selectFaultItem(page, 1);
         await utils.selectFaultItem(page, 2);
 
@@ -61,7 +61,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(secondNameInInspectorCount).toEqual(0);
     });
 
-    test('Allows you to shelve a fault', async ({ page }) => {
+    test('Allows you to shelve a fault @unstable', async ({ page }) => {
         const shelvedFaultName = await utils.getFaultName(page, 2);
         const beforeShelvedFault = utils.getFaultByName(page, shelvedFaultName);
 
@@ -80,7 +80,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(await shelvedViewFault.count()).toBe(1);
     });
 
-    test('Allows you to acknowledge a fault', async ({ page }) => {
+    test('Allows you to acknowledge a fault @unstable', async ({ page }) => {
         const acknowledgedFaultName = await utils.getFaultName(page, 3);
 
         await utils.acknowledgeFault(page, 3);
@@ -94,7 +94,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(acknowledgedFaultName).toEqual(acknowledgedViewFaultName);
     });
 
-    test('Allows you to shelve multiple faults', async ({ page }) => {
+    test('Allows you to shelve multiple faults @unstable', async ({ page }) => {
         const shelvedFaultNameOne = await utils.getFaultName(page, 1);
         const shelvedFaultNameFour = await utils.getFaultName(page, 4);
 
@@ -121,7 +121,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(await shelvedViewFaultFour.count()).toBe(1);
     });
 
-    test('Allows you to acknowledge multiple faults', async ({ page }) => {
+    test('Allows you to acknowledge multiple faults @unstable', async ({ page }) => {
         const acknowledgedFaultNameTwo = await utils.getFaultName(page, 2);
         const acknowledgedFaultNameFive = await utils.getFaultName(page, 5);
 
@@ -143,7 +143,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(await acknowledgedViewFaultFive.count()).toBe(1);
     });
 
-    test('Allows you to search faults', async ({ page }) => {
+    test('Allows you to search faults @unstable', async ({ page }) => {
         const faultThreeNamespace = await utils.getFaultNamespace(page, 3);
         const faultTwoName = await utils.getFaultName(page, 2);
         const faultFiveTriggerTime = await utils.getFaultTriggerTime(page, 5);
@@ -184,7 +184,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
         expect.soft(await utils.getFaultTriggerTime(page, 1)).toEqual(faultFiveTriggerTime);
     });
 
-    test('Allows you to sort faults', async ({ page }) => {
+    test('Allows you to sort faults @unstable', async ({ page }) => {
         const highestSeverity = await utils.getHighestSeverity(page);
         const lowestSeverity = await utils.getLowestSeverity(page);
         const faultOneName = 'Example Fault 1';
@@ -213,7 +213,7 @@ test.describe('The Fault Management Plugin without using example faults', () =>
         await utils.navigateToFaultManagementWithoutExample(page);
     });
 
-    test('Shows no faults when no faults are provided', async ({ page }) => {
+    test('Shows no faults when no faults are provided @unstable', async ({ page }) => {
         const faultCount = await page.locator('c-fault-mgmt__list').count();
 
         expect.soft(faultCount).toEqual(0);
@@ -227,7 +227,7 @@ test.describe('The Fault Management Plugin without using example faults', () =>
         expect.soft(shelvedCount).toEqual(0);
     });
 
-    test('Will return no faults when searching', async ({ page }) => {
+    test('Will return no faults when searching @unstable', async ({ page }) => {
         await utils.enterSearchTerm(page, 'fault');
 
         const faultCount = await page.locator('c-fault-mgmt__list').count();

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

@@ -35,45 +35,24 @@ const expectedAltText = process.platform === 'linux' ? 'Ctrl+Alt drag to pan' :
 
 //The following block of tests verifies the basic functionality of example imagery and serves as a template for Imagery objects embedded in other objects.
 test.describe('Example Imagery Object', () => {
-
     test.beforeEach(async ({ page }) => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
         // Create a default 'Example Imagery' object
-        createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
-
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator(backgroundImageSelector).hover({trial: true}),
-            // eslint-disable-next-line playwright/missing-playwright-await
-            expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery')
-        ]);
+        await createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
 
         // Verify that the created object is focused
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+        await page.locator(backgroundImageSelector).hover({trial: true});
     });
 
     test('Can use Mouse Wheel to zoom in and out of latest image', async ({ page }) => {
-        const deltaYStep = 100; //equivalent to 1x zoom
-        await page.locator(backgroundImageSelector).hover({trial: true});
-        const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
-        // zoom in
-        await page.locator(backgroundImageSelector).hover({trial: true});
-        await page.mouse.wheel(0, deltaYStep * 2);
-        // wait for zoom animation to finish
-        await page.locator(backgroundImageSelector).hover({trial: true});
-        const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
-        // zoom out
-        await page.locator(backgroundImageSelector).hover({trial: true});
-        await page.mouse.wheel(0, -deltaYStep);
-        // wait for zoom animation to finish
-        await page.locator(backgroundImageSelector).hover({trial: true});
-        const imageMouseZoomedOut = await page.locator(backgroundImageSelector).boundingBox();
+        // Zoom in x2 and assert
+        await mouseZoomOnImageAndAssert(page, 2);
 
-        expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
-        expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
-        expect(imageMouseZoomedOut.height).toBeLessThan(imageMouseZoomedIn.height);
-        expect(imageMouseZoomedOut.width).toBeLessThan(imageMouseZoomedIn.width);
+        // Zoom out x2 and assert
+        await mouseZoomOnImageAndAssert(page, -2);
     });
 
     test('Can adjust image brightness/contrast by dragging the sliders', async ({ page, browserName }) => {
@@ -151,30 +130,7 @@ test.describe('Example Imagery Object', () => {
     });
 
     test('Can use + - buttons to zoom on the image @unstable', async ({ page }) => {
-        // Get initial image dimensions
-        const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-
-        // Zoom in twice via button
-        await zoomIntoImageryByButton(page);
-        await zoomIntoImageryByButton(page);
-
-        // Get and assert zoomed in image dimensions
-        const zoomedInBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-        expect(zoomedInBoundingBox.height).toBeGreaterThan(initialBoundingBox.height);
-        expect(zoomedInBoundingBox.width).toBeGreaterThan(initialBoundingBox.width);
-
-        // Zoom out once via button
-        await zoomOutOfImageryByButton(page);
-
-        // Get and assert zoomed out image dimensions
-        const zoomedOutBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-        expect(zoomedOutBoundingBox.height).toBeLessThan(zoomedInBoundingBox.height);
-        expect(zoomedOutBoundingBox.width).toBeLessThan(zoomedInBoundingBox.width);
-
-        // Zoom out again via button, assert against the initial image dimensions
-        await zoomOutOfImageryByButton(page);
-        const finalBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-        expect(finalBoundingBox).toEqual(initialBoundingBox);
+        await buttonZoomOnImageAndAssert(page);
     });
 
     test('Can use the reset button to reset the image @unstable', async ({ page }, testInfo) => {
@@ -211,47 +167,223 @@ test.describe('Example Imagery Object', () => {
         await zoomIntoImageryByButton(page);
         await expect(pausePlayButton).not.toHaveClass(/is-paused/);
     });
-
 });
 
-// The following test case will cover these scenarios
-// ('Can use Mouse Wheel to zoom in and out of previous image');
-// ('Can use alt+drag to move around image once zoomed in');
-// ('Clicking on the left arrow should pause the imagery and go to previous image');
-// ('If the imagery view is in pause mode, it should not be updated when new images come in');
-// ('If the imagery view is not in pause mode, it should be updated when new images come in');
-test('Example Imagery in Display layout @unstable', async ({ page }) => {
-    test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/5265'
+test.describe('Example Imagery in Display Layout', () => {
+    let displayLayout;
+    test.beforeEach(async ({ page }) => {
+        // Go to baseURL
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        displayLayout = await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
+        await page.goto(displayLayout.url);
+
+        /* Create Sine Wave Generator with minimum Image Load Delay */
+        // Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Example Imagery
+        await page.click('text=Example Imagery');
+
+        // Clear and set Image load delay to minimum value
+        await page.locator('input[type="number"]').fill('');
+        await page.locator('input[type="number"]').fill('5000');
+
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation({waitUntil: 'networkidle'}),
+            page.click('text=OK'),
+            //Wait for Save Banner to appear
+            page.waitForSelector('.c-message-banner__message')
+        ]);
+
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+
+        await page.goto(displayLayout.url);
     });
 
-    // Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
+    test('Imagery View operations @unstable', async ({ page }) => {
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/5265'
+        });
 
-    // Click the Create button
-    await page.click('button:has-text("Create")');
+        // Edit mode
+        await page.click('button[title="Edit"]');
 
-    // Click text=Example Imagery
-    await page.click('text=Example Imagery');
+        // Click on example imagery to expose toolbar
+        await page.locator('.c-so-view__header').click();
 
-    // Clear and set Image load delay to minimum value
-    await page.locator('input[type="number"]').fill('');
-    await page.locator('input[type="number"]').fill('5000');
+        // Adjust object height
+        await page.locator('div[title="Resize object height"] > input').click();
+        await page.locator('div[title="Resize object height"] > input').fill('50');
 
-    // Click text=OK
-    await Promise.all([
-        page.waitForNavigation({waitUntil: 'networkidle'}),
-        page.click('text=OK'),
-        //Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
+        // Adjust object width
+        await page.locator('div[title="Resize object width"] > input').click();
+        await page.locator('div[title="Resize object width"] > input').fill('50');
 
-    // Wait until Save Banner is gone
-    await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
-    await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
-    await page.locator(backgroundImageSelector).hover({trial: true});
+        await performImageryViewOperationsAndAssert(page);
+    });
 
+    test('Resizing the layout changes thumbnail visibility and size', async ({ page }) => {
+        const thumbsWrapperLocator = page.locator('.c-imagery__thumbs-wrapper');
+        // Edit mode
+        await page.click('button[title="Edit"]');
+
+        // Click on example imagery to expose toolbar
+        await page.locator('.c-so-view__header').click();
+
+        // expect thumbnails not be visible when first added
+        expect.soft(thumbsWrapperLocator.isHidden()).toBeTruthy();
+
+        // Resize the example imagery vertically to change the thumbnail visibility
+        /*
+        The following arbitrary values are added to observe the separate visual
+        conditions of the thumbnails (hidden, small thumbnails, regular thumbnails).
+        Specifically, height is set to 50px for small thumbs and 100px for regular
+        */
+        await page.locator('div[title="Resize object height"] > input').click();
+        await page.locator('div[title="Resize object height"] > input').fill('50');
+
+        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
+        await expect(thumbsWrapperLocator).toHaveClass(/is-small-thumbs/);
+
+        // Resize the example imagery vertically to change the thumbnail visibility
+        await page.locator('div[title="Resize object height"] > input').click();
+        await page.locator('div[title="Resize object height"] > input').fill('100');
+
+        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
+        await expect(thumbsWrapperLocator).not.toHaveClass(/is-small-thumbs/);
+    });
+});
+
+test.describe('Example Imagery in Flexible layout', () => {
+    let flexibleLayout;
+    test.beforeEach(async ({ page }) => {
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        flexibleLayout = await createDomainObjectWithDefaults(page, { type: 'Flexible Layout' });
+        await page.goto(flexibleLayout.url);
+
+        /* Create Sine Wave Generator with minimum Image Load Delay */
+        // Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Example Imagery
+        await page.click('text=Example Imagery');
+
+        // Clear and set Image load delay to minimum value
+        await page.locator('input[type="number"]').fill('');
+        await page.locator('input[type="number"]').fill('5000');
+
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation({waitUntil: 'networkidle'}),
+            page.click('text=OK'),
+            //Wait for Save Banner to appear
+            page.waitForSelector('.c-message-banner__message')
+        ]);
+
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+
+        await page.goto(flexibleLayout.url);
+    });
+    test('Imagery View operations @unstable', async ({ page, browserName }) => {
+        test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/5326'
+        });
+
+        await performImageryViewOperationsAndAssert(page);
+    });
+});
+
+test.describe('Example Imagery in Tabs View', () => {
+    let tabsView;
+    test.beforeEach(async ({ page }) => {
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        tabsView = await createDomainObjectWithDefaults(page, { type: 'Tabs View' });
+        await page.goto(tabsView.url);
+
+        /* Create Sine Wave Generator with minimum Image Load Delay */
+        // Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Example Imagery
+        await page.click('text=Example Imagery');
+
+        // Clear and set Image load delay to minimum value
+        await page.locator('input[type="number"]').fill('');
+        await page.locator('input[type="number"]').fill('5000');
+
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation({waitUntil: 'networkidle'}),
+            page.click('text=OK'),
+            //Wait for Save Banner to appear
+            page.waitForSelector('.c-message-banner__message')
+        ]);
+
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+
+        await page.goto(tabsView.url);
+    });
+    test('Imagery View operations @unstable', async ({ page }) => {
+        await performImageryViewOperationsAndAssert(page);
+    });
+});
+
+test.describe('Example Imagery in Time Strip', () => {
+    let timeStripObject;
+    test.beforeEach(async ({ page }) => {
+        await page.goto('./', { waitUntil: 'networkidle' });
+        timeStripObject = await createDomainObjectWithDefaults(page, {
+            type: 'Time Strip',
+            name: 'Time Strip'.concat(' ', uuid())
+        });
+
+        await createDomainObjectWithDefaults(page, {
+            type: 'Example Imagery',
+            name: 'Example Imagery'.concat(' ', uuid()),
+            parent: timeStripObject.uuid
+        });
+        // 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',
+            description: 'https://github.com/nasa/openmct/issues/5632'
+        });
+        await page.locator('.c-imagery-tsv-container').hover();
+        // get url of the hovered image
+        const hoveredImg = page.locator('.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img');
+        const hoveredImgSrc = await hoveredImg.getAttribute('src');
+        expect(hoveredImgSrc).toBeTruthy();
+        await page.locator('.c-imagery-tsv-container').click();
+        // get image of view large container
+        const viewLargeImg = page.locator('img.c-imagery__main-image__image');
+        const viewLargeImgSrc = await viewLargeImg.getAttribute('src');
+        expect(viewLargeImgSrc).toBeTruthy();
+        expect(viewLargeImgSrc).toEqual(hoveredImgSrc);
+    });
+});
+
+/**
+ * Perform the common actions and assertions for the Imagery View.
+ * This function verifies the following in order:
+ * 1. Can zoom in/out using the zoom buttons
+ * 2. Can zoom in/out using the mouse wheel
+ * 3. Can pan the image using the pan hotkey + mouse drag
+ * 4. Clicking on the left arrow button pauses imagery and moves to the previous image
+ * 5. Imagery is updated as new images stream in, regardless of pause status
+ * 6. Old images are discarded when new images stream in
+ * 7. Image brightness/contrast can be adjusted by dragging the sliders
+ * @param {import('@playwright/test').Page} page
+ */
+async function performImageryViewOperationsAndAssert(page) {
     // Click previous image button
     const previousImageButton = page.locator('.c-nav--prev');
     await previousImageButton.click();
@@ -260,27 +392,17 @@ test('Example Imagery in Display layout @unstable', async ({ page }) => {
     const selectedImage = page.locator('.selected');
     await expect(selectedImage).toBeVisible();
 
-    // Zoom in
-    const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
-    await page.locator(backgroundImageSelector).hover({trial: true});
-    const deltaYStep = 100; // equivalent to 1x zoom
-    await page.mouse.wheel(0, deltaYStep * 2);
-    const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-    const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
-    const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
+    // Use the zoom buttons to zoom in and out
+    await buttonZoomOnImageAndAssert(page);
 
-    // Wait for zoom animation to finish
-    await page.locator(backgroundImageSelector).hover({trial: true});
-    const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
-    expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
-    expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
+    // Use Mouse Wheel to zoom in to previous image
+    await mouseZoomOnImageAndAssert(page, 2);
 
-    // Center the mouse pointer
-    await page.mouse.move(imageCenterX, imageCenterY);
+    // Use alt+drag to move around image once zoomed in
+    await panZoomAndAssertImageProperties(page);
 
-    // Pan Imagery Hints
-    const imageryHintsText = await page.locator('.c-imagery__hints').innerText();
-    expect(expectedAltText).toEqual(imageryHintsText);
+    // Use Mouse Wheel to zoom out of previous image
+    await mouseZoomOnImageAndAssert(page, -2);
 
     // Click next image button
     const nextImageButton = page.locator('.c-nav--next');
@@ -293,21 +415,14 @@ test('Example Imagery in Display layout @unstable', async ({ page }) => {
     await page.locator('[data-testid=conductor-modeOption-realtime]').click();
 
     // Zoom in on next image
-    await page.locator(backgroundImageSelector).hover({trial: true});
-    await page.mouse.wheel(0, deltaYStep * 2);
+    await mouseZoomOnImageAndAssert(page, 2);
 
-    // Wait for zoom animation to finish
-    await page.locator(backgroundImageSelector).hover({trial: true});
-    const imageNextMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
-    expect(imageNextMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
-    expect(imageNextMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
-
-    // Click previous image button
+    // Clicking on the left arrow should pause the imagery and go to previous image
     await previousImageButton.click();
-
-    // Verify previous image
+    await expect(page.locator('.c-button.pause-play')).toHaveClass(/is-paused/);
     await expect(selectedImage).toBeVisible();
 
+    // The imagery view should be updated when new images come in
     const imageCount = await page.locator('.c-imagery__thumb').count();
     await expect.poll(async () => {
         const newImageCount = await page.locator('.c-imagery__thumb').count();
@@ -315,7 +430,7 @@ test('Example Imagery in Display layout @unstable', async ({ page }) => {
         return newImageCount;
     }, {
         message: "verify that old images are discarded",
-        timeout: 6 * 1000
+        timeout: 7 * 1000
     }).toBe(imageCount);
 
     // Verify selected image is still displayed
@@ -333,283 +448,6 @@ test('Example Imagery in Display layout @unstable', async ({ page }) => {
     // Drag the brightness and contrast sliders around and assert filter values
     await dragBrightnessSliderAndAssertFilterValues(page);
     await dragContrastSliderAndAssertFilterValues(page);
-});
-
-test.describe('Example imagery thumbnails resize in display layouts', () => {
-    test('Resizing the layout changes thumbnail visibility and size', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        const thumbsWrapperLocator = page.locator('.c-imagery__thumbs-wrapper');
-        // Click button:has-text("Create")
-        await page.locator('button:has-text("Create")').click();
-
-        // Click li:has-text("Display Layout")
-        await page.locator('li:has-text("Display Layout")').click();
-        const displayLayoutTitleField = page.locator('text=Properties Title Notes Horizontal grid (px) Vertical grid (px) Horizontal size ( >> input[type="text"]');
-        await displayLayoutTitleField.click();
-
-        await displayLayoutTitleField.fill('Thumbnail Display Layout');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator('text=OK').click()
-        ]);
-
-        // Click text=Snapshot Save and Finish Editing Save and Continue Editing >> button >> nth=1
-        await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
-
-        // Click text=Save and Finish Editing
-        await page.locator('text=Save and Finish Editing').click();
-
-        // Click button:has-text("Create")
-        await page.locator('button:has-text("Create")').click();
-
-        // Click li:has-text("Example Imagery")
-        await page.locator('li:has-text("Example Imagery")').click();
-
-        const imageryTitleField = page.locator('text=Properties Title Notes Images url list (comma separated) Image load delay (milli >> input[type="text"]');
-        // Click text=Properties Title Notes Images url list (comma separated) Image load delay (milli >> input[type="text"]
-        await imageryTitleField.click();
-
-        // Fill text=Properties Title Notes Images url list (comma separated) Image load delay (milli >> input[type="text"]
-        await imageryTitleField.fill('Thumbnail Example Imagery');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator('text=OK').click()
-        ]);
-
-        // Click text=Thumbnail Example Imagery Imagery Layout Snapshot >> button >> nth=0
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator('text=Thumbnail Example Imagery Imagery Layout Snapshot >> button').first().click()
-        ]);
-
-        // Edit mode
-        await page.locator('text=Thumbnail Display Layout Snapshot >> button').nth(3).click();
-
-        // Click on example imagery to expose toolbar
-        await page.locator('text=Thumbnail Example Imagery Snapshot Large View').click();
-
-        // expect thumbnails not be visible when first added
-        expect.soft(thumbsWrapperLocator.isHidden()).toBeTruthy();
-
-        // Resize the example imagery vertically to change the thumbnail visibility
-        /*
-        The following arbitrary values are added to observe the separate visual
-        conditions of the thumbnails (hidden, small thumbnails, regular thumbnails).
-        Specifically, height is set to 50px for small thumbs and 100px for regular
-        */
-        // Click #mct-input-id-103
-        await page.locator('#mct-input-id-103').click();
-
-        // Fill #mct-input-id-103
-        await page.locator('#mct-input-id-103').fill('50');
-
-        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
-        await expect(thumbsWrapperLocator).toHaveClass(/is-small-thumbs/);
-
-        // Resize the example imagery vertically to change the thumbnail visibility
-        // Click #mct-input-id-103
-        await page.locator('#mct-input-id-103').click();
-
-        // Fill #mct-input-id-103
-        await page.locator('#mct-input-id-103').fill('100');
-
-        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
-        await expect(thumbsWrapperLocator).not.toHaveClass(/is-small-thumbs/);
-    });
-});
-
-test.describe('Example Imagery in Flexible layout', () => {
-    test('Example Imagery in Flexible layout @unstable', async ({ page, browserName, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-
-        // eslint-disable-next-line playwright/no-skipped-test
-        test.skip(browserName === 'firefox', 'This test needs to be updated to work with firefox');
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5326'
-        });
-
-        // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click text=Example Imagery
-        await page.click('text=Example Imagery');
-
-        // Clear and set Image load delay (milliseconds)
-        await page.click('input[type="number"]', {clickCount: 3});
-        await page.type('input[type="number"]', "20");
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('text=OK'),
-            //Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-        // Wait until Save Banner is gone
-        await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
-        await page.locator(backgroundImageSelector).hover({trial: true});
-
-        // Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click text=Flexible Layout
-        await page.click('text=Flexible Layout');
-
-        // Assert Flexible layout
-        await expect(page.locator('.js-form-title')).toHaveText('Create a New Flexible Layout');
-
-        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
-
-        // Click My Items
-        await Promise.all([
-            page.locator('text=OK').click(),
-            page.waitForNavigation({waitUntil: 'networkidle'})
-        ]);
-
-        // Click My Items
-        await page.locator('.c-disclosure-triangle').click();
-
-        // Right click example imagery
-        await page.click(('text=Unnamed Example Imagery'), { button: 'right' });
-
-        // Click move
-        await page.locator('.icon-move').click();
-
-        // Click triangle to open sub menu
-        await page.locator('.c-form__section .c-disclosure-triangle').click();
-
-        // Click Flexable Layout
-        await page.click('.c-overlay__outer >> text=Unnamed Flexible Layout');
-
-        // Click text=OK
-        await page.locator('text=OK').click();
-
-        // Save template
-        await saveTemplate(page);
-
-        // Zoom in
-        await mouseZoomIn(page);
-
-        // Center the mouse pointer
-        const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-        const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
-        const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
-        await page.mouse.move(imageCenterX, imageCenterY);
-
-        // Pan zoom
-        await panZoomAndAssertImageProperties(page);
-
-        // Click previous image button
-        const previousImageButton = page.locator('.c-nav--prev');
-        await previousImageButton.click();
-
-        // Verify previous image
-        const selectedImage = page.locator('.selected');
-        await expect(selectedImage).toBeVisible();
-
-        // Click time conductor mode button
-        await page.locator('.c-mode-button').click();
-
-        // Select local clock mode
-        await page.locator('[data-testid=conductor-modeOption-realtime]').nth(0).click();
-
-        // Zoom in on next image
-        await mouseZoomIn(page);
-
-        // Click previous image button
-        await previousImageButton.click();
-
-        // Verify previous image
-        await expect(selectedImage).toBeVisible();
-
-        const imageCount = await page.locator('.c-imagery__thumb').count();
-        await expect.poll(async () => {
-            const newImageCount = await page.locator('.c-imagery__thumb').count();
-
-            return newImageCount;
-        }, {
-            message: "verify that old images are discarded",
-            timeout: 6 * 1000
-        }).toBe(imageCount);
-
-        // Verify selected image is still displayed
-        await expect(selectedImage).toBeVisible();
-
-        // Unpause imagery
-        await page.locator('.pause-play').click();
-
-        //Get background-image url from background-image css prop
-        await assertBackgroundImageUrlFromBackgroundCss(page);
-
-        // Open the image filter menu
-        await page.locator('[role=toolbar] button[title="Brightness and contrast"]').click();
-
-        // Drag the brightness and contrast sliders around and assert filter values
-        await dragBrightnessSliderAndAssertFilterValues(page);
-        await dragContrastSliderAndAssertFilterValues(page);
-    });
-});
-
-test.describe('Example Imagery in Tabs view', () => {
-    test.fixme('Can use Mouse Wheel to zoom in and out of previous image');
-    test.fixme('Can use alt+drag to move around image once zoomed in');
-    test.fixme('Can zoom into the latest image and the real-time/fixed-time imagery will pause');
-    test.fixme('Can zoom into a previous image from thumbstrip in real-time or fixed-time');
-    test.fixme('Clicking on the left arrow should pause the imagery and go to previous image');
-    test.fixme('If the imagery view is in pause mode, it should not be updated when new images come in');
-    test.fixme('If the imagery view is not in pause mode, it should be updated when new images come in');
-});
-
-test.describe('Example Imagery in Time Strip', () => {
-    test('ensure that clicking a thumbnail loads the image in large view', async ({ page, browserName }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5632'
-        });
-        await page.goto('./', { waitUntil: 'networkidle' });
-        const timeStripObject = await createDomainObjectWithDefaults(page, {
-            type: 'Time Strip',
-            name: 'Time Strip'.concat(' ', uuid())
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Example Imagery',
-            name: 'Example Imagery'.concat(' ', uuid()),
-            parent: timeStripObject.uuid
-        });
-        // Navigate to timestrip
-        await page.goto(timeStripObject.url);
-
-        await page.locator('.c-imagery-tsv-container').hover();
-        // get url of the hovered image
-        const hoveredImg = page.locator('.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img');
-        const hoveredImgSrc = await hoveredImg.getAttribute('src');
-        expect(hoveredImgSrc).toBeTruthy();
-        await page.locator('.c-imagery-tsv-container').click();
-        // get image of view large container
-        const viewLargeImg = page.locator('img.c-imagery__main-image__image');
-        const viewLargeImgSrc = await viewLargeImg.getAttribute('src');
-        expect(viewLargeImgSrc).toBeTruthy();
-        expect(viewLargeImgSrc).toEqual(hoveredImgSrc);
-    });
-});
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function saveTemplate(page) {
-    await page.locator('.c-button--menu.c-button--major.icon-save').click();
-    await page.locator('text=Save and Finish Editing').click();
 }
 
 /**
@@ -692,7 +530,7 @@ async function assertBackgroundImageUrlFromBackgroundCss(page) {
         return backgroundImageUrl2;
     }, {
         message: "verify next image has updated",
-        timeout: 6 * 1000
+        timeout: 7 * 1000
     }).not.toBe(backgroundImageUrl1);
     console.log('backgroundImageUrl2 ' + backgroundImageUrl2);
 }
@@ -746,14 +584,17 @@ async function panZoomAndAssertImageProperties(page) {
 }
 
 /**
+ * Use the mouse wheel to zoom in or out of an image and assert that the image
+ * has successfully zoomed in or out.
  * @param {import('@playwright/test').Page} page
+ * @param {number} [factor = 2] The zoom factor. Positive for zoom in, negative for zoom out.
 */
-async function mouseZoomIn(page) {
+async function mouseZoomOnImageAndAssert(page, factor = 2) {
     // Zoom in
     const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
     await page.locator(backgroundImageSelector).hover({trial: true});
     const deltaYStep = 100; // equivalent to 1x zoom
-    await page.mouse.wheel(0, deltaYStep * 2);
+    await page.mouse.wheel(0, deltaYStep * factor);
     const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
     const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
     const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
@@ -763,9 +604,47 @@ async function mouseZoomIn(page) {
 
     // Wait for zoom animation to finish
     await page.locator(backgroundImageSelector).hover({trial: true});
-    const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
-    expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
-    expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
+    const imageMouseZoomed = await page.locator(backgroundImageSelector).boundingBox();
+
+    if (factor > 0) {
+        expect(imageMouseZoomed.height).toBeGreaterThan(originalImageDimensions.height);
+        expect(imageMouseZoomed.width).toBeGreaterThan(originalImageDimensions.width);
+    } else {
+        expect(imageMouseZoomed.height).toBeLessThan(originalImageDimensions.height);
+        expect(imageMouseZoomed.width).toBeLessThan(originalImageDimensions.width);
+    }
+}
+
+/**
+ * Zoom in and out of the image using the buttons, and assert that the image has
+ * been successfully zoomed in or out.
+ * @param {import('@playwright/test').Page} page
+ */
+async function buttonZoomOnImageAndAssert(page) {
+    // Get initial image dimensions
+    const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+
+    // Zoom in twice via button
+    await zoomIntoImageryByButton(page);
+    await zoomIntoImageryByButton(page);
+
+    // Get and assert zoomed in image dimensions
+    const zoomedInBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+    expect(zoomedInBoundingBox.height).toBeGreaterThan(initialBoundingBox.height);
+    expect(zoomedInBoundingBox.width).toBeGreaterThan(initialBoundingBox.width);
+
+    // Zoom out once via button
+    await zoomOutOfImageryByButton(page);
+
+    // Get and assert zoomed out image dimensions
+    const zoomedOutBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+    expect(zoomedOutBoundingBox.height).toBeLessThan(zoomedInBoundingBox.height);
+    expect(zoomedOutBoundingBox.width).toBeLessThan(zoomedInBoundingBox.width);
+
+    // Zoom out again via button, assert against the initial image dimensions
+    await zoomOutOfImageryByButton(page);
+    const finalBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+    expect(finalBoundingBox).toEqual(initialBoundingBox);
 }
 
 /**

package.json

@@ -5,9 +5,9 @@
   "devDependencies": {
     "@babel/eslint-parser": "7.18.9",
     "@braintree/sanitize-url": "6.0.0",
-    "@percy/cli": "1.10.0",
+    "@percy/cli": "1.10.2",
     "@percy/playwright": "1.0.4",
-    "@playwright/test": "1.23.0",
+    "@playwright/test": "1.25.2",
     "@types/eventemitter3": "^1.0.0",
     "@types/jasmine": "^4.0.1",
     "@types/karma": "^6.3.2",
@@ -34,7 +34,7 @@
     "git-rev-sync": "3.0.2",
     "html2canvas": "1.4.1",
     "imports-loader": "4.0.1",
-    "jasmine-core": "4.3.0",
+    "jasmine-core": "4.4.0",
     "karma": "6.3.20",
     "karma-chrome-launcher": "3.1.1",
     "karma-cli": "2.0.0",
@@ -62,7 +62,7 @@
     "sass-loader": "13.0.2",
     "sinon": "14.0.0",
     "style-loader": "^1.0.1",
-    "uuid": "8.3.2",
+    "uuid": "9.0.0",
     "vue": "2.6.14",
     "vue-eslint-parser": "9.0.2",
     "vue-loader": "15.9.8",
@@ -93,6 +93,7 @@
     "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js --project=chrome",
     "test:e2e:updatesnapshots": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot --update-snapshots",
     "test:e2e:visual": "percy exec --config ./e2e/.percy.yml -- npx playwright test --config=e2e/playwright-visual.config.js --grep-invert @unstable",
+    "test:e2e:visual:debug": "percy exec --config ./e2e/.percy.yml --debug -- npx playwright test --config=e2e/playwright-visual.config.js --grep-invert @unstable",
     "test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js --grep-invert @couchdb",
     "test:perf": "npx playwright test --config=e2e/playwright-performance.config.js",
     "test:watch": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run",

src/api/time/TimeAPI.js

@@ -171,27 +171,38 @@ class TimeAPI extends GlobalTimeContext {
      * @memberof module:openmct.TimeAPI#
      * @method getContextForView
      */
-    getContextForView(objectPath = []) {
-        const viewKey = objectPath.length && this.openmct.objects.makeKeyString(objectPath[0].identifier);
-
-        if (viewKey) {
-            let viewTimeContext = this.getIndependentContext(viewKey);
-            if (viewTimeContext) {
-                this.independentContexts.delete(viewKey);
-            } else {
-                viewTimeContext = new IndependentTimeContext(this.openmct, this, objectPath);
-            }
-
-            // return a new IndependentContext in case the objectPath is different
-            this.independentContexts.set(viewKey, viewTimeContext);
-
-            return viewTimeContext;
+    getContextForView(objectPath) {
+        if (!objectPath || !Array.isArray(objectPath)) {
+            throw new Error('No objectPath provided');
         }
 
-        // always follow the global time context
-        return this;
-    }
+        const viewKey = objectPath.length && this.openmct.objects.makeKeyString(objectPath[0].identifier);
 
+        if (!viewKey) {
+            // Return the global time context
+            return this;
+        }
+
+        let viewTimeContext = this.getIndependentContext(viewKey);
+        if (!viewTimeContext) {
+            // If the context doesn't exist yet, create it.
+            viewTimeContext = new IndependentTimeContext(this.openmct, this, objectPath);
+            this.independentContexts.set(viewKey, viewTimeContext);
+        } else {
+            // If it already exists, compare the objectPath to see if it needs to be updated.
+            const currentPath = this.openmct.objects.getRelativePath(viewTimeContext.objectPath);
+            const newPath = this.openmct.objects.getRelativePath(objectPath);
+
+            if (currentPath !== newPath) {
+                // If the path has changed, update the context.
+                this.independentContexts.delete(viewKey);
+                viewTimeContext = new IndependentTimeContext(this.openmct, this, objectPath);
+                this.independentContexts.set(viewKey, viewTimeContext);
+            }
+        }
+
+        return viewTimeContext;
+    }
 }
 
 export default TimeAPI;

src/plugins/remoteClock/requestInterceptor.js

@@ -20,17 +20,15 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-function remoteClockRequestInterceptor(openmct, remoteClockIdentifier, waitForBounds) {
+function remoteClockRequestInterceptor(openmct, _remoteClockIdentifier, waitForBounds) {
     let remoteClockLoaded = false;
 
     return {
         appliesTo: () => {
             // Get the activeClock from the Global Time Context
-            const { activeClock } = openmct.time.getContextForView();
+            const { activeClock } = openmct.time;
 
-            return activeClock !== undefined
-            && activeClock.key === 'remote-clock'
-            && !remoteClockLoaded;
+            return activeClock?.key === 'remote-clock' && !remoteClockLoaded;
         },
         invoke: async (request) => {
             const { start, end } = await waitForBounds();

src/plugins/timeConductor/ConductorInputsFixed.vue

@@ -78,6 +78,12 @@ export default {
             default() {
                 return undefined;
             }
+        },
+        objectPath: {
+            type: Array,
+            default() {
+                return [];
+            }
         }
     },
     data() {
@@ -127,7 +133,7 @@ export default {
     methods: {
         setTimeContext() {
             this.stopFollowingTimeContext();
-            this.timeContext = this.openmct.time.getContextForView(this.keyString ? [{identifier: this.keyString}] : []);
+            this.timeContext = this.openmct.time.getContextForView(this.keyString ? this.objectPath : []);
 
             this.handleNewBounds(this.timeContext.bounds());
             this.timeContext.on('bounds', this.handleNewBounds);

src/plugins/timeConductor/ConductorInputsRealtime.vue

@@ -90,6 +90,12 @@ export default {
                 return undefined;
             }
         },
+        objectPath: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
         inputBounds: {
             type: Object,
             default() {
@@ -162,7 +168,7 @@ export default {
         },
         setTimeContext() {
             this.stopFollowingTime();
-            this.timeContext = this.openmct.time.getContextForView(this.keyString ? [{identifier: this.keyString}] : []);
+            this.timeContext = this.openmct.time.getContextForView(this.keyString ? this.objectPath : []);
             this.followTime();
         },
         handleNewBounds(bounds) {

src/plugins/timeConductor/independent/IndependentTimeConductor.vue

@@ -52,12 +52,14 @@
             <conductor-inputs-fixed
                 v-if="isFixed"
                 :key-string="domainObject.identifier.key"
+                :object-path="objectPath"
                 @updated="saveFixedOffsets"
             />
 
             <conductor-inputs-realtime
                 v-else
                 :key-string="domainObject.identifier.key"
+                :object-path="objectPath"
                 @updated="saveClockOffsets"
             />
         </div>
@@ -85,6 +87,10 @@ export default {
         domainObject: {
             type: Object,
             required: true
+        },
+        objectPath: {
+            type: Array,
+            required: true
         }
     },
     data() {
@@ -164,7 +170,7 @@ export default {
         },
         setTimeContext() {
             this.stopFollowingTimeContext();
-            this.timeContext = this.openmct.time.getContextForView([this.domainObject]);
+            this.timeContext = this.openmct.time.getContextForView(this.objectPath);
             this.timeContext.on('clock', this.setTimeOptions);
         },
         stopFollowingTimeContext() {

src/ui/components/ObjectView.vue

@@ -6,6 +6,7 @@
     >
         <independent-time-conductor
             :domain-object="domainObject"
+            :object-path="path"
             @stateChanged="updateIndependentTimeState"
             @updated="saveTimeOptions"
         />
@@ -67,6 +68,9 @@ export default {
         };
     },
     computed: {
+        path() {
+            return this.domainObject && (this.currentObjectPath || this.objectPath);
+        },
         objectFontStyle() {
             return this.domainObject && this.domainObject.configuration && this.domainObject.configuration.fontStyle;
         },