chore(deps): update dependency cypress to v10 (#5722)

* chore(deps): update dependency cypress to v10 * chore: run automated migration script * wip changes * chore: rename spec files, adhering to new convention * chore: update yarn.lock Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dominic Saadi <dominiceliassaadi@gmail.com>
redwoodjs · Sep 16, 2022 · 7d625b2 · 7d625b2
1 parent 58ce815
commit 7d625b2
Show file tree

Hide file tree

Showing 47 changed files with 35 additions and 95 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -136,9 +136,8 @@ jobs:
         working-directory: ${{ steps.createpath.outputs.project_path }}
 
       - name: 🌲 Run cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_RW_PATH:  "${{ steps.createpath.outputs.project_path }}"
         with:
@@ -150,8 +149,8 @@ jobs:
           wait-on: 'http://localhost:8910'
           working-directory: ./tasks/e2e
           spec: |
-             cypress/integration/01-tutorial/*.spec.js
-             cypress/integration/04-logger/*.spec.js
+             cypress/e2e/01-tutorial/*.cy.js
+             cypress/e2e/04-logger/*.cy.js
 
   tutorial-e2e-docs:
     needs: only-doc-changes

diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
     "core-js": "3.25.1",
-    "cypress": "9.7.0",
+    "cypress": "10.3.1",
     "cypress-wait-until": "1.7.2",
     "eslint": "8.23.1",
     "fast-glob": "3.2.12",

diff --git a/tasks/e2e/cypress.config.js b/tasks/e2e/cypress.config.js
@@ -0,0 +1,20 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    excludeSpecPattern: ['**/codemods/*.js', '**/sharedTests.js'],
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+    supportFile: false,
+  },
+  // `runMode` is for `cypress run`, `openMode` is for `cypress open`.
+  // Locally, we use open. But in CI, we use run.
+  retries: {
+    runMode: 5,
+    openMode: 0,
+  },
+  defaultCommandTimeout: 12_0000,
+  execTimeout: 12_0000,
+  pageLoadTimeout: 12_0000,
+  requestTimeout: 12_0000,
+  taskTimeout: 12_0000,
+})
diff --git a/tasks/e2e/cypress.json b/tasks/e2e/cypress.json
diff --git a/...-tutorial/codemods/Step0_1_RedwoodToml.js → ...-tutorial/codemods/Step0_1_RedwoodToml.js b/...-tutorial/codemods/Step0_1_RedwoodToml.js → ...-tutorial/codemods/Step0_1_RedwoodToml.js
diff --git a/...n/01-tutorial/codemods/Step0_2_GraphQL.js → ...e/01-tutorial/codemods/Step0_2_GraphQL.js b/...n/01-tutorial/codemods/Step0_2_GraphQL.js → ...e/01-tutorial/codemods/Step0_2_GraphQL.js
diff --git a/...on/01-tutorial/codemods/Step1_1_Routes.js → ...2e/01-tutorial/codemods/Step1_1_Routes.js b/...on/01-tutorial/codemods/Step1_1_Routes.js → ...2e/01-tutorial/codemods/Step1_1_Routes.js
diff --git a/...01-tutorial/codemods/Step2_1_PagesHome.js → ...01-tutorial/codemods/Step2_1_PagesHome.js b/...01-tutorial/codemods/Step2_1_PagesHome.js → ...01-tutorial/codemods/Step2_1_PagesHome.js
diff --git a/...1-tutorial/codemods/Step2_2_PagesAbout.js → ...1-tutorial/codemods/Step2_2_PagesAbout.js b/...1-tutorial/codemods/Step2_2_PagesAbout.js → ...1-tutorial/codemods/Step2_2_PagesAbout.js
diff --git a/...-tutorial/codemods/Step3_1_LayoutsBlog.js → ...-tutorial/codemods/Step3_1_LayoutsBlog.js b/...-tutorial/codemods/Step3_1_LayoutsBlog.js → ...-tutorial/codemods/Step3_1_LayoutsBlog.js
diff --git a/...on/01-tutorial/codemods/Step3_2_Routes.js → ...2e/01-tutorial/codemods/Step3_2_Routes.js b/...on/01-tutorial/codemods/Step3_2_Routes.js → ...2e/01-tutorial/codemods/Step3_2_Routes.js
diff --git a/...01-tutorial/codemods/Step3_3_PagesHome.js → ...01-tutorial/codemods/Step3_3_PagesHome.js b/...01-tutorial/codemods/Step3_3_PagesHome.js → ...01-tutorial/codemods/Step3_3_PagesHome.js
diff --git a/...1-tutorial/codemods/Step3_4_PagesAbout.js → ...1-tutorial/codemods/Step3_4_PagesAbout.js b/...1-tutorial/codemods/Step3_4_PagesAbout.js → ...1-tutorial/codemods/Step3_4_PagesAbout.js
diff --git a/.../01-tutorial/codemods/Step4_1_DbSchema.js → .../01-tutorial/codemods/Step4_1_DbSchema.js b/.../01-tutorial/codemods/Step4_1_DbSchema.js → .../01-tutorial/codemods/Step4_1_DbSchema.js
diff --git a/...odemods/Step5_1_ComponentsCellBlogPost.js → ...odemods/Step5_1_ComponentsCellBlogPost.js b/...odemods/Step5_1_ComponentsCellBlogPost.js → ...odemods/Step5_1_ComponentsCellBlogPost.js
diff --git a/...ods/Step5_2_ComponentsCellBlogPostTest.js → ...ods/Step5_2_ComponentsCellBlogPostTest.js b/...ods/Step5_2_ComponentsCellBlogPostTest.js → ...ods/Step5_2_ComponentsCellBlogPostTest.js
diff --git a/...01-tutorial/codemods/Step5_3_PagesHome.js → ...01-tutorial/codemods/Step5_3_PagesHome.js b/...01-tutorial/codemods/Step5_3_PagesHome.js → ...01-tutorial/codemods/Step5_3_PagesHome.js
diff --git a/...on/01-tutorial/codemods/Step6_1_Routes.js → ...2e/01-tutorial/codemods/Step6_1_Routes.js b/...on/01-tutorial/codemods/Step6_1_Routes.js → ...2e/01-tutorial/codemods/Step6_1_Routes.js
diff --git a/...tutorial/codemods/Step6_2_BlogPostPage.js → ...tutorial/codemods/Step6_2_BlogPostPage.js b/...tutorial/codemods/Step6_2_BlogPostPage.js → ...tutorial/codemods/Step6_2_BlogPostPage.js
diff --git a/...tutorial/codemods/Step6_3_BlogPostCell.js → ...tutorial/codemods/Step6_3_BlogPostCell.js b/...tutorial/codemods/Step6_3_BlogPostCell.js → ...tutorial/codemods/Step6_3_BlogPostCell.js
diff --git a/...rial/codemods/Step6_3_BlogPostCellTest.js → ...rial/codemods/Step6_3_BlogPostCellTest.js b/...rial/codemods/Step6_3_BlogPostCellTest.js → ...rial/codemods/Step6_3_BlogPostCellTest.js
diff --git a/.../01-tutorial/codemods/Step6_4_BlogPost.js → .../01-tutorial/codemods/Step6_4_BlogPost.js b/.../01-tutorial/codemods/Step6_4_BlogPost.js → .../01-tutorial/codemods/Step6_4_BlogPost.js
diff --git a/...tutorial/codemods/Step6_4_BlogPostTest.js → ...tutorial/codemods/Step6_4_BlogPostTest.js b/...tutorial/codemods/Step6_4_BlogPostTest.js → ...tutorial/codemods/Step6_4_BlogPostTest.js
diff --git a/...utorial/codemods/Step6_5_BlogPostsCell.js → ...utorial/codemods/Step6_5_BlogPostsCell.js b/...utorial/codemods/Step6_5_BlogPostsCell.js → ...utorial/codemods/Step6_5_BlogPostsCell.js
diff --git a/...ial/codemods/Step6_5_BlogPostsCellMock.js → ...ial/codemods/Step6_5_BlogPostsCellMock.js b/...ial/codemods/Step6_5_BlogPostsCellMock.js → ...ial/codemods/Step6_5_BlogPostsCellMock.js
diff --git a/...1-tutorial/codemods/Step7_1_BlogLayout.js → ...1-tutorial/codemods/Step7_1_BlogLayout.js b/...1-tutorial/codemods/Step7_1_BlogLayout.js → ...1-tutorial/codemods/Step7_1_BlogLayout.js
diff --git a/...-tutorial/codemods/Step7_2_ContactPage.js → ...-tutorial/codemods/Step7_2_ContactPage.js b/...-tutorial/codemods/Step7_2_ContactPage.js → ...-tutorial/codemods/Step7_2_ContactPage.js
diff --git a/...ation/01-tutorial/codemods/Step7_3_Css.js → ...s/e2e/01-tutorial/codemods/Step7_3_Css.js b/...ation/01-tutorial/codemods/Step7_3_Css.js → ...s/e2e/01-tutorial/codemods/Step7_3_Css.js
diff --git a/...on/01-tutorial/codemods/Step7_4_Routes.js → ...2e/01-tutorial/codemods/Step7_4_Routes.js b/...on/01-tutorial/codemods/Step7_4_Routes.js → ...2e/01-tutorial/codemods/Step7_4_Routes.js
diff --git a/..._1_ContactPageWithoutJsEmailValidation.js → ..._1_ContactPageWithoutJsEmailValidation.js b/..._1_ContactPageWithoutJsEmailValidation.js → ..._1_ContactPageWithoutJsEmailValidation.js
diff --git a/...Step8_2_CreateContactServiceValidation.js → ...Step8_2_CreateContactServiceValidation.js b/...Step8_2_CreateContactServiceValidation.js → ...Step8_2_CreateContactServiceValidation.js
diff --git a/...ial/codemods/Step8_3_UpdateContactTest.js → ...ial/codemods/Step8_3_UpdateContactTest.js b/...ial/codemods/Step8_3_UpdateContactTest.js → ...ial/codemods/Step8_3_UpdateContactTest.js
diff --git a/...-tutorial/codemods/Step9_1_RequireAuth.js → ...-tutorial/codemods/Step9_1_RequireAuth.js b/...-tutorial/codemods/Step9_1_RequireAuth.js → ...-tutorial/codemods/Step9_1_RequireAuth.js
diff --git a/...rial/codemods/Step9_2_PostsRequireAuth.js → ...rial/codemods/Step9_2_PostsRequireAuth.js b/...rial/codemods/Step9_2_PostsRequireAuth.js → ...rial/codemods/Step9_2_PostsRequireAuth.js
diff --git a/...-tutorial/codemods/Step9_3_DisableAuth.js → ...-tutorial/codemods/Step9_3_DisableAuth.js b/...-tutorial/codemods/Step9_3_DisableAuth.js → ...-tutorial/codemods/Step9_3_DisableAuth.js
diff --git a/...ss/integration/01-tutorial/sharedTests.js → ...2e/cypress/e2e/01-tutorial/sharedTests.js b/...ss/integration/01-tutorial/sharedTests.js → ...2e/cypress/e2e/01-tutorial/sharedTests.js
diff --git a/.../integration/01-tutorial/tutorial.spec.js → ...2e/cypress/e2e/01-tutorial/tutorial.cy.js b/.../integration/01-tutorial/tutorial.spec.js → ...2e/cypress/e2e/01-tutorial/tutorial.cy.js
diff --git a/...ntegration/02-cli/02-cli-commands.spec.xs → .../cypress/e2e/02-cli/02-cli-commands.cy.xs b/...ntegration/02-cli/02-cli-commands.spec.xs → .../cypress/e2e/02-cli/02-cli-commands.cy.xs
diff --git a/...4-logger/codemods/Step1_1_Setup_Logger.js → ...4-logger/codemods/Step1_1_Setup_Logger.js b/...4-logger/codemods/Step1_1_Setup_Logger.js → ...4-logger/codemods/Step1_1_Setup_Logger.js
diff --git a/...r/codemods/Step1_2_Add_Logger_to_Posts.js → ...r/codemods/Step1_2_Add_Logger_to_Posts.js b/...r/codemods/Step1_2_Add_Logger_to_Posts.js → ...r/codemods/Step1_2_Add_Logger_to_Posts.js
diff --git a/...r/codemods/Step2_1_Setup_Prisma_Logger.js → ...r/codemods/Step2_1_Setup_Prisma_Logger.js b/...r/codemods/Step2_1_Setup_Prisma_Logger.js → ...r/codemods/Step2_1_Setup_Prisma_Logger.js
diff --git a/...ress/integration/04-logger/logger.spec.js → tasks/e2e/cypress/e2e/04-logger/logger.cy.js b/...ress/integration/04-logger/logger.spec.js → tasks/e2e/cypress/e2e/04-logger/logger.cy.js
diff --git a/tasks/e2e/cypress/plugins/index.js b/tasks/e2e/cypress/plugins/index.js
diff --git a/tasks/e2e/cypress/support/commands.js b/tasks/e2e/cypress/support/commands.js
diff --git a/tasks/e2e/cypress/support/index.js b/tasks/e2e/cypress/support/index.js
diff --git a/tasks/run-e2e b/tasks/run-e2e
@@ -157,7 +157,12 @@ const runCypress = () => {
   execa.sync(
     // do not use Yarn to run Cypress; this avoids missing binary errors
     '../../node_modules/.bin/cypress',
-    ['open', `--env RW_PATH=${REDWOOD_PROJECT_DIRECTORY}`],
+    [
+      'open',
+      `--env RW_PATH=${REDWOOD_PROJECT_DIRECTORY}`,
+      '--e2e',
+      '--browser chrome',
+    ],
     {
       cwd: path.join(REDWOODJS_FRAMEWORK_PATH, 'tasks/e2e'),
       shell: true,

diff --git a/yarn.lock b/yarn.lock
@@ -14065,9 +14065,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:9.7.0":
-  version: 9.7.0
-  resolution: "cypress@npm:9.7.0"
+"cypress@npm:10.3.1":
+  version: 10.3.1
+  resolution: "cypress@npm:10.3.1"
   dependencies:
     "@cypress/request": ^2.88.10
     "@cypress/xvfb": ^1.2.4
@@ -14113,7 +14113,7 @@ __metadata:
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 9ebffdc463ebb4db796fa27fa11883f04e696711417f544a7d793a7a283c2f79c4f5d1e528bc3d312a16a1e1d6ae63532106feb4c70b4a42f51fd3d0487d4d38
+  checksum: 5db249c8c1bce7d21c49ad3849d68ff9358cb31ead92c018846e8a79c08ad8ff51a215754e54ccc62bd8c10bd643e9971c9722a212fa646b1137b30805e193fc
   languageName: node
   linkType: hard
 
@@ -27121,7 +27121,7 @@ __metadata:
     babel-plugin-remove-code: 0.0.6
     boxen: 5.1.2
     core-js: 3.25.1
-    cypress: 9.7.0
+    cypress: 10.3.1
     cypress-wait-until: 1.7.2
     eslint: 8.23.1
     fast-glob: 3.2.12