From d4c82b4091e4cdae270c3c65bcbb799a3f20179e Mon Sep 17 00:00:00 2001 From: Jakub Mucha Date: Tue, 11 Oct 2022 20:20:33 +0200 Subject: [PATCH 1/7] chore: add setup example Signed-off-by: Jakub Mucha --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7d63974b7..a30cefd3d 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ tests with all features of cypress and playwright. Usage examples: +- [synpress-setup-example](https://github.com/drptbl/synpress-setup-example/) - [synpress](https://github.com/Synthetixio/synpress/tree/dev/tests/e2e) - [kwenta](https://github.com/kwenta/kwenta/tree/dev/tests/e2e) - [staking](https://github.com/Synthetixio/staking/tree/dev/tests/e2e) From 2c34bee31733f695cb105bc24c09bdf4554d00d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:05:17 +0000 Subject: [PATCH 2/7] chore(deps): Bump docker/setup-buildx-action from 2.0.0 to 2.1.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/dc7b9719a96d48369863986a06765841d7ea23f6...95cb08cb2672c73d4ffd2f422e6d11953d2a9c70) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/audit_and_lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml index 722efa06f..5daeeb405 100644 --- a/.github/workflows/audit_and_lint.yml +++ b/.github/workflows/audit_and_lint.yml @@ -104,7 +104,7 @@ jobs: uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # pin@v1 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # pin@v1 + uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # pin@v1 - name: Cache Docker layers uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2 From 4e9edccbfcb0501b8d243b3a2778f634d864dd8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:05:21 +0000 Subject: [PATCH 3/7] chore(deps): Bump docker/setup-qemu-action from 2.0.0 to 2.1.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/8b122486cedac8393e77aa9734c3528886e4a1a8...e81a89b1732b9c48d79cd809d8d81d79c4647a18) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/audit_and_lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml index 722efa06f..504579bcb 100644 --- a/.github/workflows/audit_and_lint.yml +++ b/.github/workflows/audit_and_lint.yml @@ -101,7 +101,7 @@ jobs: uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v2 - name: Set up QEMU - uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # pin@v1 + uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # pin@v1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # pin@v1 From 7c42eb4ef4726e1e313176846daff7a79cbb691e Mon Sep 17 00:00:00 2001 From: Jakub Mucha Date: Wed, 12 Oct 2022 20:54:17 +0200 Subject: [PATCH 4/7] deps: update Signed-off-by: Jakub Mucha --- package.json | 10 +++++----- yarn.lock | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index e22a75155..104ae3f80 100644 --- a/package.json +++ b/package.json @@ -48,12 +48,12 @@ "@cypress/react": "^6.2.0", "@cypress/webpack-dev-server": "^2.3.0", "@drptbl/gremlins.js": "^2.2.1", - "@playwright/test": "^1.26.1", + "@playwright/test": "^1.27.1", "@synthetixio/js": "^2.41.0", "@testing-library/cypress": "^8.0.3", "@testing-library/react": "^13.4.0", "@types/testing-library__cypress": "^5.0.9", - "axios": "^1.0.0", + "axios": "^1.1.2", "babel-plugin-istanbul": "^6.1.1", "babel-plugin-react-generate-property": "^1.1.2", "babel-plugin-react-remove-properties": "^0.3.0", @@ -61,7 +61,7 @@ "babel-plugin-transform-react-styled-components-qa": "^2.1.0", "bytes32": "^0.0.3", "commander": "^9.4.1", - "cypress": "^10.9.0", + "cypress": "^10.10.0", "cypress-wait-until": "^1.7.2", "debug": "^4.3.4", "dotenv": "^16.0.3", @@ -79,7 +79,7 @@ "eslint-plugin-standard": "^4.1.0", "eslint-plugin-testing-library": "^5.7.2", "eslint-plugin-ui-testing": "^2.0.1", - "eslint-plugin-unicorn": "^44.0.1", + "eslint-plugin-unicorn": "^44.0.2", "etherscan-api": "^10.2.0", "find-config": "^1.0.0", "node-fetch": "^2.6.1", @@ -91,7 +91,7 @@ "devDependencies": { "@metamask/test-dapp": "^5.2.1", "@microsoft/eslint-formatter-sarif": "^3.0.0", - "npm-check-updates": "^16.3.8", + "npm-check-updates": "^16.3.11", "release-it": "^15.5.0" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index ace539d1d..05329aa25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1181,13 +1181,13 @@ dependencies: "@octokit/openapi-types" "^13.9.0" -"@playwright/test@^1.26.1": - version "1.26.1" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.26.1.tgz#73ada4e70f618bca69ba7509c4ba65b5a41c4b10" - integrity sha512-bNxyZASVt2adSZ9gbD7NCydzcb5JaI0OR9hc7s+nmPeH604gwp0zp17NNpwXY4c8nvuBGQQ9oGDx72LE+cUWvw== +"@playwright/test@^1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.27.1.tgz#9364d1e02021261211c8ff586d903faa79ce95c4" + integrity sha512-mrL2q0an/7tVqniQQF6RBL2saskjljXzqNcCOVMUjRIgE6Y38nCNaP+Dc2FBW06bcpD3tqIws/HT9qiMHbNU0A== dependencies: "@types/node" "*" - playwright-core "1.26.1" + playwright-core "1.27.1" "@pnpm/network.ca-file@^1.0.1": version "1.0.1" @@ -2511,10 +2511,10 @@ axios@^0.21.1: dependencies: follow-redirects "^1.14.0" -axios@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.0.0.tgz#16ded6096c1d37650db9f6a8d48a2f7c1bb58622" - integrity sha512-SsHsGFN1qNPFT5QhSoSD37SHDfGyLSW5AESmyLk2JeCMHv5g0I9g0Hz/zQHx2KNe0jGXh2q2hAm7OdkXm360CA== +axios@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.2.tgz#8b6f6c540abf44ab98d9904e8daf55351ca4a331" + integrity sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -4475,10 +4475,10 @@ cypress@*: untildify "^4.0.0" yauzl "^2.10.0" -cypress@^10.9.0: - version "10.9.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.9.0.tgz#273a61a6304766f9d6423e5ac8d4a9a11ed8b485" - integrity sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA== +cypress@^10.10.0: + version "10.10.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.10.0.tgz#fd671297b2ca3e64dfffd55fe3857c388cfbb695" + integrity sha512-bU8r44x1NIYAUNNXt3CwJpLOVth7HUv2hUhYCxZmgZ1IugowDvuHNpevnoZRQx1KKOEisLvIJW+Xen5Pjn41pg== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" @@ -5393,10 +5393,10 @@ eslint-plugin-ui-testing@^2.0.1: dependencies: "@typescript-eslint/experimental-utils" "^5.3.0" -eslint-plugin-unicorn@^44.0.1: - version "44.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-44.0.1.tgz#e5171368ffadd9f5d5434342edd1fd39aad817d3" - integrity sha512-ly6Ye9OfgYBCw/FfsdycCzAztcRd+pOA0F6xZwtUsUkgOBjtNR0684xC7u+0RmE3SKr3y7z8MaIWunw36tbZdg== +eslint-plugin-unicorn@^44.0.2: + version "44.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-44.0.2.tgz#6324a001c0a5e2ac00fb51b30db27d14c6c36ab3" + integrity sha512-GLIDX1wmeEqpGaKcnMcqRvMVsoabeF0Ton0EX4Th5u6Kmf7RM9WBl705AXFEsns56ESkEs0uyelLuUTvz9Tr0w== dependencies: "@babel/helper-validator-identifier" "^7.19.1" ci-info "^3.4.0" @@ -9574,10 +9574,10 @@ npm-bundled@^2.0.0: dependencies: npm-normalize-package-bin "^2.0.0" -npm-check-updates@^16.3.8: - version "16.3.8" - resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-16.3.8.tgz#3f128ce8ca658f6af8f1ebfc8c905168a7996dfe" - integrity sha512-2CUeCWEs+arWQUJH2IEkiZU/Ak2fLBqGkMyM5JDkfnGhz1VHNe3yyGiXD+0JeVmjbXTEpgZ0t6C9VK52atGuAw== +npm-check-updates@^16.3.11: + version "16.3.11" + resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-16.3.11.tgz#96e5074234301a86861c6f80d56ff43b86825960" + integrity sha512-MxdqS3kXAJasoEaz5BLqTR1Dak+Dm6PoK2N4KdKcQGUEhdVwt0ggfJ0R0Yym8sWc48CYqEl02HBkUAZFUCufHA== dependencies: chalk "^5.0.1" cli-table "^0.3.11" @@ -10415,10 +10415,10 @@ pkg-dir@^4.1.0: dependencies: find-up "^4.0.0" -playwright-core@1.26.1: - version "1.26.1" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.26.1.tgz#a162f476488312dcf12638d97685144de6ada512" - integrity sha512-hzFchhhxnEiPc4qVPs9q2ZR+5eKNifY2hQDHtg1HnTTUuphYCBP8ZRb2si+B1TR7BHirgXaPi48LIye5SgrLAA== +playwright-core@1.27.1: + version "1.27.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.27.1.tgz#840ef662e55a3ed759d8b5d3d00a5f885a7184f4" + integrity sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q== pluralize@^8.0.0: version "8.0.0" From 25e9e16c9dde3a230ead3e7a1517c1690dfec057 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 17:06:01 +0000 Subject: [PATCH 5/7] chore(deps): Bump actions/cache from 3.0.10 to 3.0.11 Bumps [actions/cache](https://github.com/actions/cache) from 3.0.10 to 3.0.11. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1...9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/audit_and_lint.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml index c9e04eb9e..bba0d0547 100644 --- a/.github/workflows/audit_and_lint.yml +++ b/.github/workflows/audit_and_lint.yml @@ -51,7 +51,7 @@ jobs: run: yarn config set cache-folder .yarn-cache continue-on-error: true - - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2 + - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # pin@v2 with: path: | .yarn-cache @@ -107,7 +107,7 @@ jobs: uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # pin@v1 - name: Cache Docker layers - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2 + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # pin@v2 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d674fec7..222c8bdb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: run: yarn config set cache-folder .yarn-cache continue-on-error: true - - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2 + - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # pin@v2 with: path: | .yarn-cache From 8aa6133a9cd513abb2b8cca8731dd0fd7483eb2c Mon Sep 17 00:00:00 2001 From: Jakub Mucha Date: Sat, 15 Oct 2022 19:22:44 +0200 Subject: [PATCH 6/7] chore: use .env.e2e Signed-off-by: Jakub Mucha --- synpress.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/synpress.js b/synpress.js index 4cf94e44a..db6668192 100644 --- a/synpress.js +++ b/synpress.js @@ -21,6 +21,10 @@ if (process.env.SYNPRESS_LOCAL_TEST) { 'Loading .env config file from first matching config file - root dir, ancestor or home dir', ); require('dotenv').config({ path: require('find-config')('.env') }); + log( + 'Loading .env.e2e config file from first matching config file - root dir, ancestor or home dir', + ); + require('dotenv').config({ path: require('find-config')('.env.e2e') }); } if ( From 4cd45f7f16f8c07b14a7de1022b86bc74d4a07fb Mon Sep 17 00:00:00 2001 From: Jakub Mucha Date: Sat, 15 Oct 2022 19:27:13 +0200 Subject: [PATCH 7/7] deps: remove cypress/react Signed-off-by: Jakub Mucha --- package.json | 1 - plugins/index.js | 5 ----- yarn.lock | 5 ----- 3 files changed, 11 deletions(-) diff --git a/package.json b/package.json index 104ae3f80..3f4bc8e06 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ }, "dependencies": { "@cypress/code-coverage": "^3.10.0", - "@cypress/react": "^6.2.0", "@cypress/webpack-dev-server": "^2.3.0", "@drptbl/gremlins.js": "^2.2.1", "@playwright/test": "^1.27.1", diff --git a/plugins/index.js b/plugins/index.js index e99b812eb..f5eceef25 100644 --- a/plugins/index.js +++ b/plugins/index.js @@ -286,10 +286,5 @@ module.exports = (on, config) => { config.env.SKIP_METAMASK_SETUP = true; } - // next component testing - if (config.testingType === 'component') { - require('@cypress/react/plugins/next')(on, config); - } - return config; }; diff --git a/yarn.lock b/yarn.lock index 05329aa25..8a763d32b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -273,11 +273,6 @@ js-yaml "3.14.1" nyc "15.1.0" -"@cypress/react@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@cypress/react/-/react-6.2.0.tgz#5816ecd26b1595483e0ae6e4eb0dca0725d07197" - integrity sha512-arBO5/ed5MM56ypgmMugCOZoAIHH9e+7NH98oF2LCEffr8qkAV4WG5o4S+fqDjFPFP5WNZoKtPC7DEkxOm6kFA== - "@cypress/request@^2.88.10": version "2.88.10" resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"