From a056a9d122cd515eff1451e773ae00ef373b29ac Mon Sep 17 00:00:00 2001 From: Jesse Mazzella Date: Thu, 27 Jul 2023 23:28:30 -0700 Subject: [PATCH 1/4] Revert "[CI] Temporarily disable some tests (#6806)" This reverts commit 85974fc5f14179dc0b009ed24e28dd3380e88917. --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9aa1075fd6c..16110bae2f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -242,6 +242,10 @@ workflows: name: e2e-stable node-version: lts/hydrogen suite: stable + - perf-test: + node-version: lts/hydrogen + - visual-test: + node-version: lts/hydrogen the-nightly: #These jobs do not run on PRs, but against master at night jobs: From 9325947bae6cf60070bdf489e1dfc26a956df537 Mon Sep 17 00:00:00 2001 From: Jesse Mazzella Date: Fri, 28 Jul 2023 14:08:07 -0700 Subject: [PATCH 2/4] fix(e2e): fix visual tests --- e2e/tests/visual/addInit.visual.spec.js | 3 ++- e2e/tests/visual/controlledClock.visual.spec.js | 3 ++- e2e/tests/visual/default.visual.spec.js | 5 ++++- e2e/tests/visual/search.visual.spec.js | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/e2e/tests/visual/addInit.visual.spec.js b/e2e/tests/visual/addInit.visual.spec.js index 007ce9904f4..fca89299f52 100644 --- a/e2e/tests/visual/addInit.visual.spec.js +++ b/e2e/tests/visual/addInit.visual.spec.js @@ -52,7 +52,8 @@ test.describe('Visual - addInit', () => { path: path.join(__dirname, '../../helper', './addInitRestrictedNotebook.js') }); //Go to baseURL - await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' }); + await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); + await page.getByTitle("Collapse Browse Pane").click(); await createDomainObjectWithDefaults(page, { type: CUSTOM_NAME }); diff --git a/e2e/tests/visual/controlledClock.visual.spec.js b/e2e/tests/visual/controlledClock.visual.spec.js index 5a12fdf390c..e4eb03c4fb8 100644 --- a/e2e/tests/visual/controlledClock.visual.spec.js +++ b/e2e/tests/visual/controlledClock.visual.spec.js @@ -41,7 +41,8 @@ test.describe('Visual - Controlled Clock @localStorage', () => { test('Overlay Plot Loading Indicator @localStorage', async ({ page, theme }) => { // Go to baseURL - await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' }); + await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); + await page.getByTitle("Collapse Browse Pane").click(); await page.locator('a:has-text("Unnamed Overlay Plot Overlay Plot")').click(); //Ensure that we're on the Unnamed Overlay Plot object diff --git a/e2e/tests/visual/default.visual.spec.js b/e2e/tests/visual/default.visual.spec.js index e7334155677..155166187ab 100644 --- a/e2e/tests/visual/default.visual.spec.js +++ b/e2e/tests/visual/default.visual.spec.js @@ -39,7 +39,8 @@ const { createDomainObjectWithDefaults } = require('../../appActions'); test.describe('Visual - Default', () => { test.beforeEach(async ({ page }) => { //Go to baseURL and Hide Tree - await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' }); + await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); + await page.getByTitle("Collapse Browse Pane").click(); }); test.use({ clockOptions: { @@ -99,6 +100,8 @@ test.describe('Visual - Default', () => { let endDate = 'xxxx-01-01 02:00:00.000Z'; endDate = year + endDate.substring(4); + await page.getByRole('button', { name: 'Time Conductor Settings' }).click(); + await page.locator('input[type="text"]').nth(1).fill(endDate.toString()); await page.locator('input[type="text"]').first().fill(startDate.toString()); diff --git a/e2e/tests/visual/search.visual.spec.js b/e2e/tests/visual/search.visual.spec.js index 9d07fe99cab..507b9b40d6b 100644 --- a/e2e/tests/visual/search.visual.spec.js +++ b/e2e/tests/visual/search.visual.spec.js @@ -32,7 +32,8 @@ const percySnapshot = require('@percy/playwright'); test.describe('Grand Search', () => { test.beforeEach(async ({ page, theme }) => { //Go to baseURL and Hide Tree - await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' }); + await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); + await page.getByTitle("Collapse Browse Pane").click(); }); test.use({ clockOptions: { From 9c1a4fd2e079fea4f01034c38c01a9ef1facbb60 Mon Sep 17 00:00:00 2001 From: Jesse Mazzella Date: Fri, 28 Jul 2023 14:11:55 -0700 Subject: [PATCH 3/4] refactor: lint:fix --- e2e/tests/visual/addInit.visual.spec.js | 2 +- e2e/tests/visual/controlledClock.visual.spec.js | 2 +- e2e/tests/visual/default.visual.spec.js | 2 +- e2e/tests/visual/search.visual.spec.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/tests/visual/addInit.visual.spec.js b/e2e/tests/visual/addInit.visual.spec.js index fca89299f52..8e8b1e543ca 100644 --- a/e2e/tests/visual/addInit.visual.spec.js +++ b/e2e/tests/visual/addInit.visual.spec.js @@ -53,7 +53,7 @@ test.describe('Visual - addInit', () => { }); //Go to baseURL await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); - await page.getByTitle("Collapse Browse Pane").click(); + await page.getByTitle('Collapse Browse Pane').click(); await createDomainObjectWithDefaults(page, { type: CUSTOM_NAME }); diff --git a/e2e/tests/visual/controlledClock.visual.spec.js b/e2e/tests/visual/controlledClock.visual.spec.js index e4eb03c4fb8..8ecc55bf47f 100644 --- a/e2e/tests/visual/controlledClock.visual.spec.js +++ b/e2e/tests/visual/controlledClock.visual.spec.js @@ -42,7 +42,7 @@ test.describe('Visual - Controlled Clock @localStorage', () => { test('Overlay Plot Loading Indicator @localStorage', async ({ page, theme }) => { // Go to baseURL await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); - await page.getByTitle("Collapse Browse Pane").click(); + await page.getByTitle('Collapse Browse Pane').click(); await page.locator('a:has-text("Unnamed Overlay Plot Overlay Plot")').click(); //Ensure that we're on the Unnamed Overlay Plot object diff --git a/e2e/tests/visual/default.visual.spec.js b/e2e/tests/visual/default.visual.spec.js index 155166187ab..d0375bc4769 100644 --- a/e2e/tests/visual/default.visual.spec.js +++ b/e2e/tests/visual/default.visual.spec.js @@ -40,7 +40,7 @@ test.describe('Visual - Default', () => { test.beforeEach(async ({ page }) => { //Go to baseURL and Hide Tree await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); - await page.getByTitle("Collapse Browse Pane").click(); + await page.getByTitle('Collapse Browse Pane').click(); }); test.use({ clockOptions: { diff --git a/e2e/tests/visual/search.visual.spec.js b/e2e/tests/visual/search.visual.spec.js index 507b9b40d6b..449e60afdb6 100644 --- a/e2e/tests/visual/search.visual.spec.js +++ b/e2e/tests/visual/search.visual.spec.js @@ -33,7 +33,7 @@ test.describe('Grand Search', () => { test.beforeEach(async ({ page, theme }) => { //Go to baseURL and Hide Tree await page.goto('./#/browse/mine', { waitUntil: 'networkidle' }); - await page.getByTitle("Collapse Browse Pane").click(); + await page.getByTitle('Collapse Browse Pane').click(); }); test.use({ clockOptions: { From a919c93d17e965e5e0d2606befe07b6364621a4a Mon Sep 17 00:00:00 2001 From: Jesse Mazzella Date: Fri, 28 Jul 2023 14:33:00 -0700 Subject: [PATCH 4/4] fix: revert localStorage data changes --- e2e/test-data/VisualTestData_storage.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/test-data/VisualTestData_storage.json b/e2e/test-data/VisualTestData_storage.json index 017415dce40..02fe3cd82b5 100644 --- a/e2e/test-data/VisualTestData_storage.json +++ b/e2e/test-data/VisualTestData_storage.json @@ -5,18 +5,18 @@ "origin": "http://localhost:8080", "localStorage": [ { - "name": "mct", - "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},\"58f55f3a-46d9-4c37-a726-27b5d38b895a\":{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400878,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400878},\"19f2e461-190e-4662-8d62-251e90bb7aac\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1689710400433,\"location\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"created\":1689710400433,\"persisted\":1689710400433}}" + "name": "tcHistory", + "value": "{\"utc\":[{\"start\":1658617611983,\"end\":1658619411983}]}" }, { - "name": "mct-recent-objects", - "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400435,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400436},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"domainObject\":{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400435,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400436}},{\"objectPath\":[{\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"},\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1689710400433,\"location\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"created\":1689710400433,\"persisted\":1689710400433},{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400435,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400436},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/58f55f3a-46d9-4c37-a726-27b5d38b895a/19f2e461-190e-4662-8d62-251e90bb7aac\",\"domainObject\":{\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"},\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1689710400433,\"location\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"created\":1689710400433,\"persisted\":1689710400433}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},{\"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\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654}}]" + "name": "mct", + "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"persisted\":1658619412848,\"modified\":1658619412848},\"7fa5749b-8969-494c-9d85-c272516d333c\":{\"identifier\":{\"key\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"namespace\":\"\"},\"name\":\"Unnamed Overlay Plot\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"}}]},\"modified\":1658619413566,\"location\":\"mine\",\"persisted\":1658619413567},\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\"},\"modified\":1658619413552,\"location\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"persisted\":1658619413552}}" }, { "name": "mct-tree-expanded", - "value": "[]" + "value": "[\"/browse/mine\"]" } ] } ] -} \ No newline at end of file +}