From dd57d78c4f1e5117b109cd22551d18b7f4058314 Mon Sep 17 00:00:00 2001 From: Scott Bell Date: Sat, 7 Sep 2024 11:30:14 +0200 Subject: [PATCH] add some basic object path label tests --- .../plugins/comps/comps.e2e.spec.js | 23 ++++++++++++++++--- src/plugins/comps/components/CompsView.vue | 5 +++- src/ui/components/ObjectPathString.vue | 5 +--- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/e2e/tests/functional/plugins/comps/comps.e2e.spec.js b/e2e/tests/functional/plugins/comps/comps.e2e.spec.js index d4f4860086..9e3e8d7c86 100644 --- a/e2e/tests/functional/plugins/comps/comps.e2e.spec.js +++ b/e2e/tests/functional/plugins/comps/comps.e2e.spec.js @@ -28,12 +28,19 @@ test.describe('Comps', () => { await page.goto('./', { waitUntil: 'domcontentloaded' }); }); - test('Basic Functionality Works', async ({ page }) => { + test('Basic Functionality Works', async ({ page, openmctConfig }) => { + const folder = await createDomainObjectWithDefaults(page, { + type: 'Folder' + }); + // Create the comps with defaults - const comp = await createDomainObjectWithDefaults(page, { type: 'Derived Telemetry' }); + const comp = await createDomainObjectWithDefaults(page, { + type: 'Derived Telemetry', + parent: folder.uuid + }); // Create a sine wave generator within the comp - await createDomainObjectWithDefaults(page, { + const sineWaveGenerator1 = await createDomainObjectWithDefaults(page, { type: 'Sine Wave Generator', parent: comp.uuid }); @@ -65,12 +72,22 @@ test.describe('Comps', () => { // should be a number expect(parseFloat(testValue)).not.toBeNaN(); + // Check that object path is correct + const { myItemsFolderName } = openmctConfig; + let objectPath = await page.getByLabel(`${sineWaveGenerator1.name} Object Path`).textContent(); + const expectedObjectPath = `/${myItemsFolderName}/${folder.name}/${comp.name}/${sineWaveGenerator1.name}`; + expect(objectPath).toBe(expectedObjectPath); + // Check that the comps are saved await page.getByLabel('Save').click(); await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click(); const expression = await page.getByLabel('Expression', { exact: true }).textContent(); expect(expression).toBe('b*2'); + // Check that object path is still correct after save + objectPath = await page.getByLabel(`${sineWaveGenerator1.name} Object Path`).textContent(); + expect(objectPath).toBe(expectedObjectPath); + // Check that comps work after being saved testValue = await page.getByLabel('Current Output Value').textContent(); expect(testValue).not.toBe('10'); diff --git a/src/plugins/comps/components/CompsView.vue b/src/plugins/comps/components/CompsView.vue index 058c40d0bc..94cc3b1adf 100644 --- a/src/plugins/comps/components/CompsView.vue +++ b/src/plugins/comps/components/CompsView.vue @@ -71,7 +71,10 @@ />
{{ parameter.name }}
= - + {{ orderedPathStr }} @@ -32,8 +32,6 @@