From fa2134572d7a3c4743a4b8fd07558559029d8813 Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Sat, 15 Oct 2022 00:05:36 +0800 Subject: [PATCH 1/3] fix: The record key is obstructed in v10 (#24125) * fix: resolves obstructed record key * fix: use findByDisplayValue for tests rather than test ID * fix: update other failing tests * fix: resolves ui regression * chore: resolves suggested semantic updates Co-authored-by: Matt Henkes Co-authored-by: astone123 Co-authored-by: Stokes Player Co-authored-by: Bill Glesias --- packages/app/cypress/e2e/runs.cy.ts | 4 ++-- packages/app/cypress/e2e/top-nav.cy.ts | 2 +- packages/app/src/runs/RunsEmpty.cy.tsx | 2 +- packages/app/src/runs/RunsEmpty.vue | 2 +- .../app/src/specs/banners/RecordBanner.cy.tsx | 2 +- .../src/components/TerminalPrompt.cy.tsx | 2 +- .../src/components/TerminalPrompt.vue | 18 +++++++++--------- .../src/gql-components/HeaderBarContent.cy.tsx | 2 +- .../src/gql-components/RecordPrompt.cy.tsx | 8 ++++---- .../src/gql-components/RecordRunModal.cy.tsx | 2 +- .../topnav/UpdateCypressModal.cy.tsx | 2 +- .../launchpad/cypress/e2e/project-setup.cy.ts | 2 +- .../launchpad/src/setup/ManualInstall.cy.tsx | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/app/cypress/e2e/runs.cy.ts b/packages/app/cypress/e2e/runs.cy.ts index 9a79cb4aecff..a825ef5c9de3 100644 --- a/packages/app/cypress/e2e/runs.cy.ts +++ b/packages/app/cypress/e2e/runs.cy.ts @@ -591,7 +591,7 @@ describe('App: Runs', { viewportWidth: 1200 }, () => { scaffoldTestingTypeAndVisitRunsPage('component') cy.contains(defaultMessages.runs.empty.title).should('be.visible') cy.contains(defaultMessages.runs.empty.description).should('be.visible') - cy.contains('cypress run --component --record --key 2aaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa').should('be.visible') + cy.findByDisplayValue('npx cypress run --component --record --key 2aaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa').should('be.visible') }) it('displays how to record prompt when connected and no runs in E2E', () => { @@ -599,7 +599,7 @@ describe('App: Runs', { viewportWidth: 1200 }, () => { cy.contains(defaultMessages.runs.empty.title).should('be.visible') cy.contains(defaultMessages.runs.empty.description).should('be.visible') - cy.contains('cypress run --record --key 2aaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa').should('be.visible') + cy.findByDisplayValue('npx cypress run --record --key 2aaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa').should('be.visible') }) it('displays a copy button and copies correct command in Component Testing', () => { diff --git a/packages/app/cypress/e2e/top-nav.cy.ts b/packages/app/cypress/e2e/top-nav.cy.ts index d3a05f6515ab..47b546b63291 100644 --- a/packages/app/cypress/e2e/top-nav.cy.ts +++ b/packages/app/cypress/e2e/top-nav.cy.ts @@ -211,7 +211,7 @@ describe('App Top Nav Workflows', () => { cy.findByRole('dialog', { name: 'Upgrade to Cypress 10.1.0' }).as('upgradeModal').within(() => { cy.contains('You are currently running Version 10.0.0 of Cypress').should('be.visible') - cy.contains('npm install -D cypress@10.1.0').should('be.visible') + cy.findByDisplayValue('npm install -D cypress@10.1.0').should('be.visible') cy.findByRole('button', { name: 'Close' }).click() }) diff --git a/packages/app/src/runs/RunsEmpty.cy.tsx b/packages/app/src/runs/RunsEmpty.cy.tsx index 31074bd2aa4b..aa5e83c727a3 100644 --- a/packages/app/src/runs/RunsEmpty.cy.tsx +++ b/packages/app/src/runs/RunsEmpty.cy.tsx @@ -21,6 +21,6 @@ describe('RunsEmpty', () => { } as any cy.contains(defaultMessages.specPage.banners.record.title).should('be.visible') - cy.contains('npx cypress run --component --record --key abcd-efg-1234').should('be.visible') + cy.findByDisplayValue('npx cypress run --component --record --key abcd-efg-1234').should('be.visible') }) }) diff --git a/packages/app/src/runs/RunsEmpty.vue b/packages/app/src/runs/RunsEmpty.vue index e9cc4e94c000..0a8654187a2d 100644 --- a/packages/app/src/runs/RunsEmpty.vue +++ b/packages/app/src/runs/RunsEmpty.vue @@ -10,7 +10,7 @@

{{ t("runs.empty.description") }}

- + diff --git a/packages/app/src/specs/banners/RecordBanner.cy.tsx b/packages/app/src/specs/banners/RecordBanner.cy.tsx index 076ed117157a..1b8510865723 100644 --- a/packages/app/src/specs/banners/RecordBanner.cy.tsx +++ b/packages/app/src/specs/banners/RecordBanner.cy.tsx @@ -24,7 +24,7 @@ describe('', () => { cy.contains(defaultMessages.specPage.banners.record.title).should('be.visible') cy.contains(defaultMessages.specPage.banners.record.content).should('be.visible') - cy.findByText('npx cypress run --component --record --key abcd-efg-1234') + cy.findByDisplayValue('npx cypress run --component --record --key abcd-efg-1234').should('be.visible') cy.percySnapshot() }) diff --git a/packages/frontend-shared/src/components/TerminalPrompt.cy.tsx b/packages/frontend-shared/src/components/TerminalPrompt.cy.tsx index e68b7ed53905..f59afbd6ee60 100644 --- a/packages/frontend-shared/src/components/TerminalPrompt.cy.tsx +++ b/packages/frontend-shared/src/components/TerminalPrompt.cy.tsx @@ -23,7 +23,7 @@ describe('', () => { )) - cy.contains(command) + cy.findByDisplayValue(command).should('be.visible') cy.contains('button', defaultMessages.clipboard.copy) .should('be.visible') .percySnapshot() diff --git a/packages/frontend-shared/src/components/TerminalPrompt.vue b/packages/frontend-shared/src/components/TerminalPrompt.vue index e9ff97883a5c..4a7266d2065f 100644 --- a/packages/frontend-shared/src/components/TerminalPrompt.vue +++ b/packages/frontend-shared/src/components/TerminalPrompt.vue @@ -1,11 +1,17 @@