Skip to content

Commit

Permalink
Upgrade Cypress to v7 (#327)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vadorequest authored May 29, 2021
1 parent c7b0165 commit f9a5928
Show file tree
Hide file tree
Showing 11 changed files with 258 additions and 1,382 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vercel-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ jobs:
runs-on: ubuntu-18.04
# Docker image with Cypress pre-installed
# https://github.com/cypress-io/cypress-docker-images/tree/master/included
container: cypress/included:6.8.0
container: cypress/included:7.4.0
needs: await-for-vercel-deployment
timeout-minutes: 20 # Limit current job timeout https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vercel-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ jobs:
runs-on: ubuntu-18.04
# Docker image with Cypress pre-installed
# https://github.com/cypress-io/cypress-docker-images/tree/master/included
container: cypress/included:6.8.0
container: cypress/included:7.4.0
needs: await-for-vercel-deployment
timeout-minutes: 20 # Limit current job timeout https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes
steps:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/deploy-vercel-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ on:
- '!**/*.md' # Exclude all markdown files
- 'stories/**/*.md' # Force include all markdown files within stories (because they're used for storybook)

env:
STAGE: staging

jobs:
# Configures the deployment environment, install dependencies (like node, npm, etc.) that are requirements for the upcoming jobs
# Ex: Necessary to run `yarn deploy`
Expand Down Expand Up @@ -188,7 +191,7 @@ jobs:
runs-on: ubuntu-18.04
# Docker image with Cypress pre-installed
# https://github.com/cypress-io/cypress-docker-images/tree/master/included
container: cypress/included:6.8.0
container: cypress/included:7.4.0
needs: await-for-vercel-deployment
steps:
- uses: actions/checkout@v1 # Get last commit pushed - See https://github.com/actions/checkout
Expand Down
2 changes: 1 addition & 1 deletion cypress/config-customer-ci-cd.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"videosFolder": "cypress/videos/customer",
"env": {},
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
"experimentalInteractiveRunEvents": true
}
2 changes: 1 addition & 1 deletion cypress/config-customer1.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"videosFolder": "cypress/videos/customer1",
"env": {},
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
"experimentalInteractiveRunEvents": true
}
2 changes: 1 addition & 1 deletion cypress/config-customer2.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"videosFolder": "cypress/videos/customer2",
"env": {},
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
"experimentalInteractiveRunEvents": true
}
2 changes: 1 addition & 1 deletion cypress/config-development.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"videosFolder": "cypress/videos/development",
"env": {},
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
"experimentalInteractiveRunEvents": true
}
2 changes: 1 addition & 1 deletion cypress/config-storybook.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"integrationFolder": "cypress/integration-storybook",
"env": {},
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
"experimentalInteractiveRunEvents": true
}
1 change: 0 additions & 1 deletion cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
// ***********************************************************

// See https://dev.to/cuichenli/how-do-i-setup-my-nextjs-development-environment-2kao
import '@cypress/react/support';
import './commands';

// See https://docs.cypress.io/api/events/catalog-of-events.html#Uncaught-Exceptions
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"uuid": "8.3.2"
},
"devDependencies": {
"@cypress/react": "4.16.4",
"@cypress/react": "5.8.1",
"@emotion/babel-preset-css-prop": "11.2.0",
"@emotion/eslint-plugin": "11.2.0",
"@next/bundle-analyzer": "10.2.0",
Expand Down Expand Up @@ -228,7 +228,7 @@
"concurrently": "6.1.0",
"cross-env": "7.0.3",
"current-git-branch": "1.1.0",
"cypress": "6.8.0",
"cypress": "7.4.0",
"del-cli": "3.0.1",
"dotenv": "9.0.2",
"eslint": "7.26.0",
Expand Down
1,616 changes: 245 additions & 1,371 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit f9a5928

Please sign in to comment.