From 850973e7095c5d0d1af7c2ca7af015088c1ce3c6 Mon Sep 17 00:00:00 2001 From: Stokes Player Date: Thu, 25 May 2023 13:27:17 -0400 Subject: [PATCH 01/16] test: fix 2 broken tests for Windows (#26854) --- .circleci/workflows.yml | 2 +- packages/app/cypress/e2e/specs_list_e2e.cy.ts | 4 +++- packages/data-context/src/actions/ProjectActions.ts | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index ec0582d3dc10..5e0ac591593c 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -72,7 +72,7 @@ windowsWorkflowFilters: &windows-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'ryanm/feat/unify-cdp-approach-in-electron', << pipeline.git.branch >> ] + - equal: [ 'stokes/fix_windows_e2e_test', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> diff --git a/packages/app/cypress/e2e/specs_list_e2e.cy.ts b/packages/app/cypress/e2e/specs_list_e2e.cy.ts index df59656ffd44..a8a98ed481a3 100644 --- a/packages/app/cypress/e2e/specs_list_e2e.cy.ts +++ b/packages/app/cypress/e2e/specs_list_e2e.cy.ts @@ -88,7 +88,9 @@ describe('App: Spec List (E2E)', () => { it('lists files after folders when in same directory', () => { cy.findAllByTestId('row-directory-depth-2').first().click() - cy.get('[id="speclist-cypress/e2e/admin_users/"]') + const rowId = getPathForPlatform('speclist-cypress/e2e/admin_users/').replaceAll('\\', '\\\\') + + cy.get(`[id="${rowId}"]`) .next() .should('contain', 'admin.user') .next() diff --git a/packages/data-context/src/actions/ProjectActions.ts b/packages/data-context/src/actions/ProjectActions.ts index d5d28934b2e9..254b14cad479 100644 --- a/packages/data-context/src/actions/ProjectActions.ts +++ b/packages/data-context/src/actions/ProjectActions.ts @@ -9,7 +9,7 @@ import type { ProjectShape } from '../data/coreDataShape' import type { DataContext } from '..' import { hasNonExampleSpec } from '../codegen' import templates from '../codegen/templates' -import { insertValuesInConfigFile } from '../util' +import { insertValuesInConfigFile, toPosix } from '../util' import { getError } from '@packages/errors' import { resetIssuedWarnings } from '@packages/config' import type { RunSpecErrorCode } from '@packages/graphql/src/schemaTypes' @@ -606,9 +606,12 @@ export class ProjectActions { // Now that we're in the correct testingType, verify the requested spec actually exists // We don't have specs available until a testingType is loaded, so even through we validated // a matching file exists above it may not end up loading as a valid spec so we validate that here - const spec = this.ctx.project.getCurrentSpecByAbsolute(absoluteSpecPath) + // + // Have to use toPosix here to align windows absolute paths with how the absolute path is storied in the data context + const spec = this.ctx.project.getCurrentSpecByAbsolute(toPosix(absoluteSpecPath)) if (!spec) { + debug(`Spec not found with path: ${absoluteSpecPath}`) throw new RunSpecError('SPEC_NOT_FOUND', `Unable to find matching spec with path ${absoluteSpecPath}`) } From 0cf11fe4167a2f447994bc279afbd2cfcb93c46f Mon Sep 17 00:00:00 2001 From: Ben M Date: Fri, 26 May 2023 08:55:38 -0400 Subject: [PATCH 02/16] Update stale_issues_and_pr_cleanup.yml Upped the number of operations per run. Have been manually doing that so this job can get through all the issues in the repo with no problems. --- .github/workflows/stale_issues_and_pr_cleanup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stale_issues_and_pr_cleanup.yml b/.github/workflows/stale_issues_and_pr_cleanup.yml index 444fefc26cbb..503ce803c021 100644 --- a/.github/workflows/stale_issues_and_pr_cleanup.yml +++ b/.github/workflows/stale_issues_and_pr_cleanup.yml @@ -9,7 +9,7 @@ on: max-operations-per-run: description: 'max operations per run' required: false - default: 800 + default: 3000 days-before-stale: description: 'days-before-stale' required: false @@ -33,7 +33,7 @@ permissions: pull-requests: write env: DEFAULT_DEBUG_ONLY: true - DEFAULT_MAX_OPS: 800 + DEFAULT_MAX_OPS: 3000 DEFAULT_DAYS_BEFORE_STALE: 180 DEFAULT_DAYS_BEFORE_CLOSE: 14 DEFAULT_EXEMPT_ISSUE_LABELS: 'type: feature,type: enhancement,routed-to-e2e,routed-to-ct,routed-to-tools,routed-to-cloud,prevent-stale,triaged' From d34a148472d53b02d24d626d09563669556c0769 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Fri, 26 May 2023 18:27:52 +0100 Subject: [PATCH 03/16] chore(dep): [Snyk] Upgrade vite from 2.9.13 to 2.9.15 (#26830) Co-authored-by: Ben M --- .../projects/vite-ct-object-api/package.json | 2 +- .../projects/vite-ct-object-api/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/system-tests/projects/vite-ct-object-api/package.json b/system-tests/projects/vite-ct-object-api/package.json index 1f47e6b16f6a..b5a6942d2c3e 100644 --- a/system-tests/projects/vite-ct-object-api/package.json +++ b/system-tests/projects/vite-ct-object-api/package.json @@ -6,6 +6,6 @@ "@testing-library/cypress": "9.0.0", "ansi-regex": "4.1.1", "typescript": "4.2.3", - "vite": "2.9.13" + "vite": "2.9.15" } } diff --git a/system-tests/projects/vite-ct-object-api/yarn.lock b/system-tests/projects/vite-ct-object-api/yarn.lock index 502aa16f433e..3c6f683fd3a0 100644 --- a/system-tests/projects/vite-ct-object-api/yarn.lock +++ b/system-tests/projects/vite-ct-object-api/yarn.lock @@ -370,10 +370,10 @@ resolve@^1.22.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -rollup@^2.59.0: - version "2.70.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e" - integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA== +"rollup@>=2.59.0 <2.78.0": + version "2.77.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" + integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== optionalDependencies: fsevents "~2.3.2" @@ -406,14 +406,14 @@ typescript@4.2.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== -vite@2.9.13: - version "2.9.13" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.13.tgz#859cb5d4c316c0d8c6ec9866045c0f7858ca6abc" - integrity sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw== +vite@2.9.15: + version "2.9.15" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.15.tgz#2858dd5b2be26aa394a283e62324281892546f0b" + integrity sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ== dependencies: esbuild "^0.14.27" postcss "^8.4.13" resolve "^1.22.0" - rollup "^2.59.0" + rollup ">=2.59.0 <2.78.0" optionalDependencies: fsevents "~2.3.2" From acc4d5faf32aec0ab88e7a0134059043d1c377b9 Mon Sep 17 00:00:00 2001 From: Ben M Date: Tue, 30 May 2023 11:10:45 -0400 Subject: [PATCH 04/16] Update triage_add_to_project.yml --- .github/workflows/triage_add_to_project.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/triage_add_to_project.yml b/.github/workflows/triage_add_to_project.yml index 841d9d3cb58b..11c27119b66d 100644 --- a/.github/workflows/triage_add_to_project.yml +++ b/.github/workflows/triage_add_to_project.yml @@ -6,6 +6,10 @@ on: secrets: ADD_TO_TRIAGE_BOARD_TOKEN: required: true + TRIAGE_BOARD_TOKEN: + required: true + WORKFLOW_DEPLOY_KEY: + required: true issues: types: - opened From bafabf9c0f63c80db6d8e5930dcb58bacbfa1027 Mon Sep 17 00:00:00 2001 From: Adam Stone-Lord Date: Wed, 31 May 2023 21:56:06 +0000 Subject: [PATCH 05/16] chore: fix minor background color styling in debug results component (#26887) --- packages/app/src/debug/DebugResults.vue | 2 +- packages/app/src/debug/DebugRunNavigationRow.vue | 1 - packages/frontend-shared/src/components/ResultCounts.vue | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/app/src/debug/DebugResults.vue b/packages/app/src/debug/DebugResults.vue index 8a2998d82d6d..0d4b2ea042c3 100644 --- a/packages/app/src/debug/DebugResults.vue +++ b/packages/app/src/debug/DebugResults.vue @@ -1,6 +1,6 @@