Skip to content

Commit

Permalink
Update Cypress config for v13 (#580)
Browse files Browse the repository at this point in the history
  • Loading branch information
frederikprijck authored Sep 19, 2023
1 parent 5c467e1 commit cdc65a5
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/actions/integration/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ runs:
- name: Run Cypress test
uses: cypress-io/github-action@v6
with:
spec: cypress/integration/smoke.test.ts
spec: cypress/e2e/smoke.cy.ts
install: false
wait-on: 'http://localhost:3001/, http://localhost:3000'
2 changes: 1 addition & 1 deletion .github/workflows/browserstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- name: Run tests
shell: bash
run: npx concurrently --raw --kill-others --success first "npm:start" "wait-on http://127.0.0.1:3000/ && browserstack-cypress run --build-name ${{ github.event.pull_request.head.sha || github.ref }} --no-wrap --specs "cypress/integration/smoke-bs.test.ts""
run: npx concurrently --raw --kill-others --success first "npm:start" "wait-on http://127.0.0.1:3000/ && browserstack-cypress run --build-name ${{ github.event.pull_request.head.sha || github.ref }} --no-wrap --specs "cypress/e2e/smoke-bs.cy.ts""
env:
BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
4 changes: 2 additions & 2 deletions browserstack.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
}
],
"run_settings": {
"cypress_config_file": "./cypress-bs.json",
"cypress-version": "9",
"cypress_config_file": "./cypress.config.js",
"cypress-version": "13.1",
"project_name": "Auth0 React SDK",
"exclude": [],
"parallels": "5",
Expand Down
17 changes: 17 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const { defineConfig } = require('cypress');

module.exports = defineConfig({
chromeWebSecurity: false,
viewportWidth: 1000,
viewportHeight: 1000,
fixturesFolder: false,
reporter: 'junit',
reporterOptions: {
mochaFile: 'test-results/cypress/junit-[hash].xml',
},
e2e: {
setupNodeEvents(on, config) {},
baseUrl: 'http://localhost:3000',
supportFile: false,
},
});
13 changes: 0 additions & 13 deletions cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"test:nextjs": "start-server-and-test start:api 3001 start:nextjs 3000 cypress:run",
"test:nextjs:watch": "start-server-and-test start:api 3001 start:nextjs 3000 cypress:open",
"test:integration": "npm run test:cra && npm run test:gatsby && npm run test:nextjs",
"cypress:run": "cypress run --spec 'cypress/integration/smoke.test.ts'",
"cypress:run": "cypress run --spec 'cypress/e2e/smoke.cy.ts'",
"cypress:open": "cypress open"
},
"repository": {
Expand Down

0 comments on commit cdc65a5

Please sign in to comment.