From 88a94c80be66dcd74c53e378faad0500c85f28a5 Mon Sep 17 00:00:00 2001 From: Scott Bell Date: Wed, 5 Jan 2022 18:57:25 +0100 Subject: [PATCH] Unable to create domain objects (#4672) * Run full regression suite on PR * rename job * specify new testsuites to run * use newer objects types * Limit concurrency to 2 workers * CI! Co-authored-by: John Hill Co-authored-by: John Hill --- .circleci/config.yml | 2 +- e2e/playwright-ci.config.js | 1 + package.json | 2 +- src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js | 5 +---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 368984a985..ded3baf46d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,7 @@ workflows: post-steps: - upload_code_covio - e2e-test: - name: e2e-smoke + name: e2e-ci node-version: lts/fermium suite: ci the-nightly: #These jobs do not run on PRs, but against master at night diff --git a/e2e/playwright-ci.config.js b/e2e/playwright-ci.config.js index a6d0d62a31..852d395683 100644 --- a/e2e/playwright-ci.config.js +++ b/e2e/playwright-ci.config.js @@ -13,6 +13,7 @@ const config = { timeout: 200 * 1000, reuseExistingServer: !process.env.CI }, + workers: 2, //Limit to 2 for CircleCI Agent use: { browserName: "chromium", baseURL: 'http://localhost:8080/', diff --git a/package.json b/package.json index 2157be1c1d..0fbda6f121 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run", "test:coverage": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" COVERAGE=true karma start --single-run", "test:coverage:firefox": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run --browsers=FirefoxHeadless", - "test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js smoke", + "test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js smoke default condition.e2e", "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js", "test:e2e:visual": "percy exec -- npx playwright test --config=e2e/playwright-visual.config.js default", "test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js", diff --git a/src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js b/src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js index 16c703555d..c7fbd8cdef 100644 --- a/src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js +++ b/src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js @@ -29,10 +29,7 @@ define( } SummaryWidgetsCompositionPolicy.prototype.allow = function (parent, child) { - const parentType = parent.getCapability('type'); - const newStyleChild = child.useCapability('adapter'); - - if (parentType.instanceOf('summary-widget') && !this.openmct.telemetry.isTelemetryObject(newStyleChild)) { + if (parent.type === 'summary-widget' && !this.openmct.telemetry.isTelemetryObject(child)) { return false; }