feat(*): upgrade cypress

tomalaforge · tomalaforge · commit 5be923c25691 · 2025-01-27T21:07:25.000+01:00
diff --git a/apps/testing/17-router/cypress/support/commands.ts b/apps/testing/17-router/cypress/support/commands.ts
@@ -23,20 +23,3 @@ declare global {
 }
 
 Cypress.Commands.add('mount', mount);
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/apps/testing/17-router/project.json b/apps/testing/17-router/project.json
@@ -82,6 +82,15 @@
           "coverage": true
         }
       }
+    },
+    "component-test": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/testing/17-router/cypress.config.ts",
+        "testingType": "component",
+        "skipServe": true,
+        "devServerTarget": "testing-router:build"
+      }
     }
   }
 }
diff --git a/apps/testing/17-router/tsconfig.json b/apps/testing/17-router/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.base.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/18-nested-components/cypress/support/commands.ts b/apps/testing/18-nested-components/cypress/support/commands.ts
@@ -23,20 +23,3 @@ declare global {
 }
 
 Cypress.Commands.add('mount', mount);
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/apps/testing/18-nested-components/project.json b/apps/testing/18-nested-components/project.json
@@ -82,6 +82,15 @@
           "coverage": true
         }
       }
+    },
+    "component-test": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/testing/18-nested-components/cypress.config.ts",
+        "testingType": "component",
+        "skipServe": true,
+        "devServerTarget": "testing-nested-components:build"
+      }
     }
   }
 }
diff --git a/apps/testing/18-nested-components/tsconfig.json b/apps/testing/18-nested-components/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.base.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/19-input-output/cypress/support/commands.ts b/apps/testing/19-input-output/cypress/support/commands.ts
@@ -23,20 +23,3 @@ declare global {
 }
 
 Cypress.Commands.add('mount', mount);
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/apps/testing/19-input-output/project.json b/apps/testing/19-input-output/project.json
@@ -82,6 +82,15 @@
           "coverage": true
         }
       }
+    },
+    "component-test": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/testing/19-input-output/cypress.config.ts",
+        "testingType": "component",
+        "skipServe": true,
+        "devServerTarget": "testing-input-output:build"
+      }
     }
   }
 }
diff --git a/apps/testing/19-input-output/tsconfig.json b/apps/testing/19-input-output/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.base.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/20-modal/cypress/support/commands.ts b/apps/testing/20-modal/cypress/support/commands.ts
@@ -23,20 +23,3 @@ declare global {
 }
 
 Cypress.Commands.add('mount', mount);
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/apps/testing/20-modal/project.json b/apps/testing/20-modal/project.json
@@ -85,6 +85,15 @@
           "coverage": true
         }
       }
+    },
+    "component-test": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/testing/20-modal/cypress.config.ts",
+        "testingType": "component",
+        "skipServe": true,
+        "devServerTarget": "testing-modal:build"
+      }
     }
   }
 }
diff --git a/apps/testing/20-modal/tsconfig.json b/apps/testing/20-modal/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.base.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/29-real-life-application/cypress/support/commands.ts b/apps/testing/29-real-life-application/cypress/support/commands.ts
@@ -23,20 +23,3 @@ declare global {
 }
 
 Cypress.Commands.add('mount', mount);
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/apps/testing/29-real-life-application/project.json b/apps/testing/29-real-life-application/project.json
@@ -85,6 +85,15 @@
           "coverage": true
         }
       }
+    },
+    "component-test": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/testing/29-real-life-application/cypress.config.ts",
+        "testingType": "component",
+        "skipServe": true,
+        "devServerTarget": "testing-real-life-application:build"
+      }
     }
   }
 }
diff --git a/apps/testing/29-real-life-application/tsconfig.json b/apps/testing/29-real-life-application/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.base.json"
+      "path": "./cypress/tsconfig .json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/nx.json b/nx.json
@@ -92,15 +92,6 @@
         "extensions": ["ts", "tsx", "js", "jsx", "html", "vue"]
       }
     },
-    {
-      "plugin": "@nx/cypress/plugin",
-      "options": {
-        "targetName": "component-test",
-        "ciTargetName": "e2e-ci",
-        "openTargetName": "open-cypress",
-        "componentTestingTargetName": "component-test"
-      }
-    },
     {
       "plugin": "@nx/jest/plugin",
       "options": {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "@typescript-eslint/utils": "^7.16.0",
     "all-contributors-cli": "^6.26.1",
     "autoprefixer": "^10.4.0",
-    "cypress": "13.13.1",
+    "cypress": "14.0.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-cypress": "2.15.1",

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,15 @@`
`82`	`82`	`"coverage": true`
`83`	`83`	`}`
`84`	`84`	`}`
	`85`	`+ },`
	`86`	`+ "component-test": {`
	`87`	`+ "executor": "@nx/cypress:cypress",`
	`88`	`+ "options": {`
	`89`	`+ "cypressConfig": "apps/testing/17-router/cypress.config.ts",`
	`90`	`+ "testingType": "component",`
	`91`	`+ "skipServe": true,`
	`92`	`+ "devServerTarget": "testing-router:build"`
	`93`	`+ }`
`85`	`94`	`}`
`86`	`95`	`}`
`87`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"path": "./tsconfig.editor.json"`
`23`	`23`	`},`
`24`	`24`	`{`
`25`		`- "path": "./cypress/tsconfig.base.json"`
	`25`	`+ "path": "./cypress/tsconfig.json"`
`26`	`26`	`}`
`27`	`27`	`],`
`28`	`28`	`"extends": "../../../tsconfig.base.json",`