chore: move e2e in ssr app

edbzn · edbzn · commit 1cd31dbf6396 · 2023-10-27T15:39:35.000+02:00
diff --git a/apps/ssr-e2e/project.json b/apps/ssr-e2e/project.json
diff --git a/apps/ssr-e2e/tsconfig.json b/apps/ssr-e2e/tsconfig.json
diff --git a/apps/ssr/.eslintrc.json b/apps/ssr/.eslintrc.json
@@ -0,0 +1,22 @@
+{
+  "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.cy.{ts,js,tsx,jsx}", "cypress/**/*.{ts,js,tsx,jsx}"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/apps/ssr/cypress.config.ts b/apps/ssr/cypress.config.ts
@@ -2,5 +2,5 @@ import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
-  e2e: nxE2EPreset(__dirname),
+  e2e: nxE2EPreset(__filename, { cypressDir: 'cypress' }),
 });
diff --git a/apps/ssr/cypress/e2e/app.cy.ts b/apps/ssr/cypress/e2e/app.cy.ts
diff --git a/apps/ssr/cypress/support/commands.ts b/apps/ssr/cypress/support/commands.ts
@@ -1,5 +1,7 @@
+/// <reference types="cypress" />
+
 // ***********************************************
-// This example commands.js shows you how to
+// This example commands.ts shows you how to
 // create various custom commands and overwrite
 // existing commands.
 //
@@ -8,8 +10,8 @@
 // https://on.cypress.io/custom-commands
 // ***********************************************
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
+// eslint-disable-next-line @typescript-eslint/no-namespace, @typescript-eslint/no-unused-vars
 declare namespace Cypress {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-interface
   interface Chainable<Subject> {}
 }
diff --git a/apps/ssr/cypress/support/e2e.ts b/apps/ssr/cypress/support/e2e.ts
@@ -1,5 +1,5 @@
 // ***********************************************************
-// This example support/index.js is processed and
+// This example support/e2e.ts is processed and
 // loaded automatically before your test files.
 //
 // This is a great place to put global configuration and
@@ -13,5 +13,5 @@
 // https://on.cypress.io/configuration
 // ***********************************************************
 
-// Import commands.js using ES2015 syntax:
+// Import commands.ts using ES2015 syntax:
 import './commands';
diff --git a/apps/ssr/cypress/tsconfig.json b/apps/ssr/cypress/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["cypress", "node"],
+    "sourceMap": false
+  },
+  "include": [
+    "**/*.ts",
+    "**/*.js",
+    "../cypress.config.ts",
+    "../**/*.cy.ts",
+    "../**/*.cy.tsx",
+    "../**/*.cy.js",
+    "../**/*.cy.jsx",
+    "../**/*.d.ts"
+  ]
+}
diff --git a/apps/ssr/project.json b/apps/ssr/project.json
@@ -113,7 +113,27 @@
           "serverTarget": "ssr:server:production"
         }
       }
+    },
+    "e2e": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/ssr/cypress.config.ts",
+        "testingType": "e2e",
+        "devServerTarget": "ssr:serve-ssr"
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "ssr:serve:production"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/ssr/**/*.{js,ts}"]
+      }
     }
   },
-  "tags": []
+  "tags": ["type:app"]
 }
diff --git a/apps/ssr/tsconfig.json b/apps/ssr/tsconfig.json
@@ -11,6 +11,9 @@
     },
     {
       "path": "./tsconfig.editor.json"
+    },
+    {
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "compilerOptions": {
diff --git a/package.json b/package.json
@@ -112,6 +112,7 @@
     "eslint-plugin-cypress": "2.15.1",
     "husky": "^8.0.3",
     "jest": "^29.4.1",
+    "express": "4.18.2",
     "jest-environment-jsdom": "29.5.0",
     "jest-preset-angular": "12.2.3",
     "klaw-sync": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
@@ -10678,7 +10678,7 @@ expect@^29.5.0:
     jest-message-util "^29.5.0"
     jest-util "^29.5.0"
 
-express@^4.17.3, express@^4.18.2:
+express@4.18.2, express@^4.17.3, express@^4.18.2:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
   integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`},`
`12`	`12`	`{`
`13`	`13`	`"path": "./tsconfig.editor.json"`
	`14`	`+ },`
	`15`	`+ {`
	`16`	`+ "path": "./cypress/tsconfig.json"`
`14`	`17`	`}`
`15`	`18`	`],`
`16`	`19`	`"compilerOptions": {`