Skip to content

Commit

Permalink
chore: update cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
stepan662 committed Jul 29, 2022
1 parent c6ea23e commit 7d3263d
Show file tree
Hide file tree
Showing 29 changed files with 79 additions and 238 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:

- id: set-dirs
run: echo "::set-output name=dirs::$(ls | jq -R -s -c 'split("\n")[:-1]')"
working-directory: e2e/cypress/integration
working-directory: e2e/cypress/e2e

outputs:
dirs: ${{ steps.set-dirs.outputs.dirs }}
Expand Down
13 changes: 13 additions & 0 deletions e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* eslint-disable @typescript-eslint/no-var-requires */
import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
// @ts-ignore
return require('./cypress/plugins/index.js')(on, config);
},
},
});
1 change: 0 additions & 1 deletion e2e/cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"author": "Jan Cizmar",
"license": "BSD",
"devDependencies": {
"cypress": "^8.3.1",
"cypress": "^10.3.1",
"cypress-browser-extension-plugin": "^0.1.0",
"cypress-dotenv": "^1.2.2",
"cypress-file-upload": "^4.1.1",
"cypress-xpath": "^1.6.1",
"dotenv": "^8.2.0",
"cypress-dotenv": "^2.0.0",
"cypress-file-upload": "^5.0.8",
"cypress-xpath": "^2.0.1",
"dotenv": "^16.0.1",
"download-github-release": "^0.3.2",
"typescript": "^3.9.7"
"typescript": "^4.7.4"
}
}
2 changes: 1 addition & 1 deletion e2e/scripts/startCypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -x
ARGS="--browser chrome --headed"

if [ -n "$E2E_APP" ]; then
npx cypress run $ARGS --spec "cypress/integration/$E2E_APP/**"
npx cypress run $ARGS --spec "cypress/e2e/$E2E_APP/**"
else
npx cypress run $ARGS
fi
6 changes: 4 additions & 2 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"compilerOptions": {
"target": "es5",
"lib": ["es5", "dom", "es2020"],
"types": ["cypress", "cypress-xpath/src"]
"types": ["cypress", "cypress-xpath/src"],
"checkJs": false,
"allowJs": true
},
"include": ["**/*.ts"]
"include": ["**/*.ts", "cypress/plugins/index.js"]
}
Loading

0 comments on commit 7d3263d

Please sign in to comment.