Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update cypress #1612

Merged
merged 3 commits into from
Mar 3, 2023
Merged

Update cypress #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c99b4bc
Update cypress
jhaals Mar 3, 2023
62abae8
format
jhaals Mar 3, 2023
3491549
upgrade runner
jhaals Mar 3, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: cd website && yarn install
- name: yarn lint
run: cd website && yarn run lint
- uses: cypress-io/github-action@v2
- uses: cypress-io/github-action@v5
with:
start: yarn start
wait-on: "http://localhost:3000"
Expand Down
9 changes: 9 additions & 0 deletions website/cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineConfig } from 'cypress';

export default defineConfig({
projectId: 'ona5c5',
e2e: {
baseUrl: 'http://localhost:3000',
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
});
4 changes: 0 additions & 4 deletions website/cypress.json
View file
Open in desktop

This file was deleted.

0 website/cypress/integration/create_secret.js → website/cypress/e2e/create_secret.js
View file
Open in desktop
File renamed without changes.
0 ...ite/cypress/integration/decrypt_secret.js → website/cypress/e2e/decrypt_secret.js
View file
Open in desktop
File renamed without changes.
0 website/cypress/integration/delete_secret.js → website/cypress/e2e/delete_secret.js
View file
Open in desktop
File renamed without changes.
0 website/cypress/integration/upload_file.js → website/cypress/e2e/upload_file.js
View file
Open in desktop
File renamed without changes.
32 changes: 0 additions & 32 deletions website/cypress/plugins/index.js
View file
Open in desktop

This file was deleted.

0 website/cypress/support/index.js → website/cypress/support/e2e.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"format": "prettier --ignore-path .gitignore -c --write .",
"lint": "prettier --ignore-path .gitignore -c .",
"cypress": "cypress open",
"cy:run": "cypress run",
"cy:run": "cypress run -b chrome",
"ci": "start-server-and-test start http://localhost:3000 cy:run"
},
"devDependencies": {
Expand All @@ -45,7 +45,7 @@
"@types/react-dom": "^17.0.14",
"@types/react-dropzone": "^5.1.0",
"@types/react-router-dom": "^5.3.3",
"cypress": "^9.6.1",
"cypress": "^12.7.0",
"cypress-file-upload": "^5.0.8",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.26.0",
Expand Down
27 changes: 17 additions & 10 deletions website/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4739,10 +4739,10 @@ cypress-file-upload@^5.0.8:
resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==

cypress@^9.6.1:
version "9.6.1"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.6.1.tgz#a7d6b5a53325b3dc4960181f5800a5ade0f085eb"
integrity sha512-ECzmV7pJSkk+NuAhEw6C3D+RIRATkSb2VAHXDY6qGZbca/F9mv5pPsj2LO6Ty6oIFVBTrwCyL9agl28MtJMe2g==
cypress@^12.7.0:
version "12.7.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.7.0.tgz#69900f82af76cf3ba0ddb9b59ec3b0d38222ab22"
integrity sha512-7rq+nmhzz0u6yabCFyPtADU2OOrYt6pvUau9qV7xyifJ/hnsaw/vkr0tnLlcuuQKUAOC1v1M1e4Z0zG7S0IAvA==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"
Expand All @@ -4761,9 +4761,9 @@ cypress@^9.6.1:
commander "^5.1.0"
common-tags "^1.8.0"
dayjs "^1.10.4"
debug "^4.3.2"
debug "^4.3.4"
enquirer "^2.3.6"
eventemitter2 "^6.4.3"
eventemitter2 "6.4.7"
execa "4.1.0"
executable "^4.1.1"
extract-zip "2.0.1"
Expand Down Expand Up @@ -4841,6 +4841,13 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
dependencies:
ms "^2.1.1"

debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"

decimal.js@^10.2.1:
version "10.3.1"
resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
Expand Down Expand Up @@ -5596,10 +5603,10 @@ event-stream@=3.3.4:
stream-combiner "~0.0.4"
through "~2.3.1"

eventemitter2@^6.4.3:
version "6.4.4"
resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b"
integrity sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw==
[email protected].7:
version "6.4.7"
resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==

eventemitter3@^4.0.0:
version "4.0.4"
Expand Down