Merge branch 'master' into eval-source-maps

chore: bump @playwright/test to 1.42.1 (#7627 )
* chore: bump `@playwright/test` to `1.42.1` * chore(circleci): don't try to re-run individual percy tests
2024-03-25 11:12:17 -07:00 · 2024-03-21 09:27:41 -07:00 · 2024-03-20 20:20:48 +00:00 · 2024-03-15 10:41:14 -07:00 · 2024-03-13 12:34:29 -07:00
10 changed files with 37 additions and 44 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,11 +5,11 @@ orbs:
 executors:
  pw-focal-development:
    docker:
-      - image: mcr.microsoft.com/playwright:v1.39.0-focal
+      - image: mcr.microsoft.com/playwright:v1.42.1-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)
      PERCY_PARALLEL_TOTAL: 2
  ubuntu:
    machine:
@@ -17,7 +17,7 @@ executors:
      docker_layer_caching: true
 commands:
  build_and_install:
-    description: "All steps used to build and install."
+    description: 'All steps used to build and install.'
    parameters:
      node-version:
        type: string
@@ -27,7 +27,7 @@ commands:
          node-version: << parameters.node-version >>
      - node/install-packages
  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)
@@ -38,7 +38,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
@@ -102,7 +102,7 @@ jobs:
          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:
@@ -159,7 +159,7 @@ jobs:
    steps:
      - build_and_install:
          node-version: lts/hydrogen
-      - run: npx playwright@1.39.0 install #Necessary for bare ubuntu machine
+      - run: npx playwright@1.42.1 install #Necessary for bare ubuntu machine
      - run: |
          export $(cat src/plugins/persistence/couch/.env.ci | xargs)
          docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
@@ -230,11 +230,7 @@ jobs:
    steps:
      - build_and_install:
          node-version: lts/iron
-      - run:
-          command: |
-            mkdir test-results
-            TESTFILES=$(circleci tests glob "e2e/**/*.spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test:e2e:visual:<<parameters.suite>>" --verbose --split-by=timings
+      - run: npm run test:e2e:visual:<<parameters.suite>>
      - store_test_results:
          path: test-results/results.xml
      - store_artifacts:
@@ -286,7 +282,7 @@ workflows:
      - e2e-couchdb
    triggers:
      - schedule:
-          cron: "0 0 * * *"
+          cron: '0 0 * * *'
          filters:
            branches:
              only:
--- a/.github/workflows/e2e-couchdb.yml
+++ b/.github/workflows/e2e-couchdb.yml
@@ -37,7 +37,7 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - run: npx playwright@1.39.0 install
+      - run: npx playwright@1.42.1 install

      - name: Start CouchDB Docker Container and Init with Setup Scripts
        run: |
--- a/.github/workflows/e2e-flakefinder.yml
+++ b/.github/workflows/e2e-flakefinder.yml
@@ -30,7 +30,7 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-node-

-      - run: npx playwright@1.39.0 install
+      - run: npx playwright@1.42.1 install
      - run: npm ci --no-audit --progress=false

      - name: Run E2E Tests (Repeated 10 Times)
--- a/.github/workflows/e2e-perf.yml
+++ b/.github/workflows/e2e-perf.yml
@@ -28,7 +28,7 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-node-

-      - run: npx playwright@1.39.0 install
+      - run: npx playwright@1.42.1 install
      - run: npm ci --no-audit --progress=false
      - run: npm run test:perf:localhost
      - run: npm run test:perf:contract
--- a/.github/workflows/e2e-pr.yml
+++ b/.github/workflows/e2e-pr.yml
@@ -33,7 +33,7 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-node-

-      - run: npx playwright@1.39.0 install
+      - run: npx playwright@1.42.1 install
      - run: npx playwright install chrome-beta
      - run: npm ci --no-audit --progress=false
      - run: npm run test:e2e:full -- --max-failures=40
--- a/.webpack/webpack.prod.js
+++ b/.webpack/webpack.prod.js
@@ -15,5 +15,5 @@ export default merge(common, {
      __OPENMCT_ROOT_RELATIVE__: '""'
    })
  ],
-  devtool: 'source-map'
+  devtool: 'eval-source-map'
 });
--- a/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
@@ -292,6 +292,16 @@ test.describe('Basic Condition Set Use', () => {
    await expect(page.getByRole('menuitem', { name: /Conditions View/ })).toBeVisible();
    await expect(page.getByRole('menuitem', { name: /Plot/ })).toBeVisible();
    await expect(page.getByRole('menuitem', { name: /Telemetry Table/ })).toBeVisible();
+    await page.getByLabel('Plot').click();
+    await expect(
+      page.getByLabel('Plot Legend Collapsed').getByText('Test Condition Set')
+    ).toBeVisible();
+    await page.getByLabel('Open the View Switcher Menu').click();
+    await page.getByLabel('Telemetry Table').click();
+    await expect(page.getByRole('searchbox', { name: 'output filter input' })).toBeVisible();
+    await page.getByLabel('Open the View Switcher Menu').click();
+    await page.getByLabel('Conditions View').click();
+    await expect(page.getByText('Current Output')).toBeVisible();
  });
  test('ConditionSet has correct outputs when telemetry is and is not available', async ({
    page
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
        "@braintree/sanitize-url": "6.0.4",
        "@percy/cli": "1.27.4",
        "@percy/playwright": "1.0.4",
-        "@playwright/test": "1.39.0",
+        "@playwright/test": "1.42.1",
        "@types/d3-axis": "3.0.6",
        "@types/d3-scale": "4.0.8",
        "@types/d3-selection": "3.0.10",
@@ -1548,12 +1548,12 @@
      }
    },
    "node_modules/@playwright/test": {
-      "version": "1.39.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",
-      "integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz",
+      "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==",
      "dev": true,
      "dependencies": {
-        "playwright": "1.39.0"
+        "playwright": "1.42.1"
      },
      "bin": {
        "playwright": "cli.js"
@@ -9026,12 +9026,12 @@
      }
    },
    "node_modules/playwright": {
-      "version": "1.39.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",
-      "integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz",
+      "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==",
      "dev": true,
      "dependencies": {
-        "playwright-core": "1.39.0"
+        "playwright-core": "1.42.1"
      },
      "bin": {
        "playwright": "cli.js"
@@ -9048,7 +9048,6 @@
      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz",
      "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==",
      "dev": true,
-      "peer": true,
      "bin": {
        "playwright-core": "cli.js"
      },
@@ -9070,18 +9069,6 @@
        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
      }
    },
-    "node_modules/playwright/node_modules/playwright-core": {
-      "version": "1.39.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
-      "integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
-      "dev": true,
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
    "node_modules/plotly.js-basic-dist-min": {
      "version": "2.29.1",
      "resolved": "https://registry.npmjs.org/plotly.js-basic-dist-min/-/plotly.js-basic-dist-min-2.29.1.tgz",
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
    "@braintree/sanitize-url": "6.0.4",
    "@percy/cli": "1.27.4",
    "@percy/playwright": "1.0.4",
-    "@playwright/test": "1.39.0",
+    "@playwright/test": "1.42.1",
    "@types/d3-axis": "3.0.6",
    "@types/d3-shape": "3.0.0",
    "@types/d3-scale": "4.0.8",
@@ -156,4 +156,4 @@
  "keywords": [
    "nasa"
  ]
-}
+}
--- a/src/plugins/condition/ConditionManager.js
+++ b/src/plugins/condition/ConditionManager.js
@@ -364,7 +364,7 @@ export default class ConditionManager extends EventEmitter {
    let nextLegOptions = { ...options };
    delete nextLegOptions.onPartialResponse;

-    const results = Promise.all(
+    const results = await Promise.all(
      this.conditions.map((condition) => condition.requestLADConditionResult(nextLegOptions))
    );
Author	SHA1	Message	Date
David Tsay	cc58dbd5e7	Merge branch 'master' into eval-source-maps	2024-03-25 11:12:17 -07:00
Jesse Mazzella	d68ac31ab5	chore: bump `@playwright/test` to `1.42.1` (#7627 ) * chore: bump `@playwright/test` to `1.42.1` * chore(circleci): don't try to re-run individual percy tests	2024-03-21 09:27:41 -07:00
Jesse Mazzella	f504ee29cc	fix: 🤖 beep boop beep, you forgot an `await` 🤖 (#7630 ) * fix: 🤖 beep boop beep, you forgot an `await` 🤖 * add e2e test --------- Co-authored-by: Scott Bell <scott@traclabs.com>	2024-03-20 20:20:48 +00:00
David Tsay	c19c4e7065	Merge branch 'master' into eval-source-maps	2024-03-15 10:41:14 -07:00
David Tsay	3bb4df8d39	enable eval-source-maps	2024-03-13 12:34:29 -07:00