Skip to content

chore: Update to cypress v12 #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cypress-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
paths:
- 'demos/canary/**/*.{js,jsx,ts,tsx}'
- 'cypress/integration/canary/**/*.{ts,js}'
- 'cypress/e2e/canary/**/*.{ts,js}'
- 'src/**/*.{ts,js}'
jobs:
cypress:
Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:
- name: Cypress run
if: ${{ steps.deploy.outputs.origin-url }}
id: cypress
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v5
with:
browser: chrome
headless: true
record: true
parallel: true
config-file: cypress/config/canary.json
config-file: cypress/config/canary.config.ts
group: 'Next Runtime - Demo Canary'
spec: cypress/integration/canary/*
spec: cypress/e2e/canary/*
env:
DEBUG: '@cypress/github-action'
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cypress-demo-nx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
paths:
- 'demos/nx-next-monorepo-demo/**/*.{js,jsx,ts,tsx}'
- 'cypress/integration/nx/**/*.{ts,js}'
- 'cypress/e2e/nx/**/*.{ts,js}'
- 'src/**/*.{ts,js}'
jobs:
cypress:
Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:
- name: Cypress run
if: ${{ steps.deploy.outputs.origin-url }}
id: cypress
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v5
with:
browser: chrome
headless: true
record: true
parallel: true
config-file: cypress/config/nx-demo.json
config-file: cypress/config/nx-demo.config.ts
group: 'Next Runtime - Demo NX'
spec: cypress/integration/nx/*
spec: cypress/e2e/nx/*
env:
DEBUG: '@cypress/github-action'
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cypress-demo-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
paths:
- 'demos/static-root/**/*.{js,jsx,ts,tsx}'
- 'cypress/integration/static/**/*.{ts,js}'
- 'cypress/e2e/static/**/*.{ts,js}'
- 'src/**/*.{ts,js}'
jobs:
cypress:
Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:
- name: Cypress run
if: ${{ steps.deploy.outputs.origin-url }}
id: cypress
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v5
with:
browser: chrome
headless: true
record: true
parallel: true
config-file: cypress/config/static-root.json
config-file: cypress/config/static-root.config.ts
group: 'Next Runtime - Demo Static'
spec: cypress/integration/static-root/*
spec: cypress/e2e/static-root/*
env:
DEBUG: '@cypress/github-action'
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cypress-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
paths:
- 'demos/default/**/*.{js,jsx,ts,tsx}'
- 'cypress/integration/default/**/*.{ts,js}'
- 'cypress/e2e/default/**/*.{ts,js}'
- 'src/**/*.{ts,js}'
jobs:
cypress:
Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:
- name: Cypress run
if: ${{ steps.deploy.outputs.origin-url }}
id: cypress
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v5
with:
browser: chrome
headless: true
record: true
parallel: true
config-file: cypress/config/ci.json
config-file: cypress/config/ci.config.ts

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

group: 'Next Runtime - Demo'
spec: cypress/integration/default/*
spec: cypress/e2e/default/*
env:
DEBUG: '@cypress/github-action'
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cypress-middleware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
paths:
- 'demos/middleware/**/*.{js,jsx,ts,tsx}'
- 'cypress/integration/middleware/**/*.{ts,js}'
- 'cypress/e2e/middleware/**/*.{ts,js}'
- 'src/**/*.{ts,js}'
jobs:
cypress:
Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:
- name: Cypress run
if: ${{ steps.deploy.outputs.origin-url }}
id: cypress
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v5
with:
browser: chrome
headless: true
record: true
parallel: true
config-file: cypress/config/middleware.json
config-file: cypress/config/middleware.config.ts
group: 'Next Runtime - Middleware'
spec: cypress/integration/middleware/*
spec: cypress/e2e/middleware/*
env:
DEBUG: '@cypress/github-action'
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}
Expand Down
8 changes: 8 additions & 0 deletions cypress/config/all.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineConfig } from 'cypress'

export default defineConfig({
video: false,
e2e: {
baseUrl: 'http://localhost:3000',
},
})
4 changes: 0 additions & 4 deletions cypress/config/all.json

This file was deleted.

10 changes: 10 additions & 0 deletions cypress/config/canary.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineConfig } from 'cypress'

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:3000',
// integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
"specPattern": "cypress/e2e/canary",
"projectId": "5zbkdv"
},
})
5 changes: 0 additions & 5 deletions cypress/config/canary.json

This file was deleted.

10 changes: 10 additions & 0 deletions cypress/config/ci.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineConfig } from 'cypress'

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:3000',
// integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
"specPattern": "cypress/e2e/default",
"projectId": "66va58"
},
})
5 changes: 0 additions & 5 deletions cypress/config/ci.json

This file was deleted.

10 changes: 10 additions & 0 deletions cypress/config/middleware.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineConfig } from 'cypress'

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:8888',
// integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
"specPattern": "cypress/e2e/middleware",
"projectId": "yn8qwi"
},
})
5 changes: 0 additions & 5 deletions cypress/config/middleware.json

This file was deleted.

10 changes: 10 additions & 0 deletions cypress/config/nx-demo.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineConfig } from 'cypress'

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:4200',
// integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
"specPattern": "cypress/e2e/nx",
"projectId": "ijcdpo"
},
})
5 changes: 0 additions & 5 deletions cypress/config/nx-demo.json

This file was deleted.

11 changes: 11 additions & 0 deletions cypress/config/static-root.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { defineConfig } from 'cypress'

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:3000',
// integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
"specPattern": "cypress/e2e/static-root",
"projectId": "3tvrbe"
},
})

5 changes: 0 additions & 5 deletions cypress/config/static-root.json

This file was deleted.

File renamed without changes.
File renamed without changes.
52 changes: 29 additions & 23 deletions demos/nx-next-monorepo-demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demos/nx-next-monorepo-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@typescript-eslint/eslint-plugin": "^5.36.1",
"@typescript-eslint/parser": "^5.36.1",
"babel-jest": "28.1.3",
"cypress": "^10.7.0",
"cypress": "^12.10.0",
"eslint": "~8.15.0",
"eslint-config-next": "12.3.4",
"eslint-config-prettier": "8.8.0",
Expand Down
Loading