test: add cypress paths

ngx-rocket · Dec 3, 2021 · bde28f6 · bde28f6
1 parent d9b9b1b
commit bde28f6
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 20 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -152,7 +152,7 @@ class NgxGenerator extends Generator {
     this.props.auth = this.props.features.includes('auth');
     this.props.lazy = this.props.features.includes('lazy');
     this.props.e2e = this.props.tools.includes('protractor'); // legacy e2e
-    this.props.cypress = this.props.features.includes('cypress');
+    this.props.cypress = this.props.features.includes('cypress') && !this.props.e2e;
     this.props.angulartics = this.props.features.includes('angulartics');
     this.shareProps(this.props);
   }

diff --git a/generators/app/templates/__cypress._cypress.json b/generators/app/templates/__cypress._cypress.json
@@ -5,12 +5,5 @@
   "screenshotsFolder": "cypress/screenshots",
   "pluginsFile": "cypress/plugins/index.ts",
   "fixturesFolder": "cypress/fixtures",
-  "baseUrl": "http://localhost:4200",
-  "testFiles": [
-<% if (props.auth) { -%>
-    "login.ts",
-<%   } -%>
-    "home.ts",
-    "about.ts"
-  ]
+  "baseUrl": "http://localhost:4200"
 }
diff --git a/scripts/tests/app/cordova/bootstrap-authentication.json b/scripts/tests/app/cordova/bootstrap-authentication.json
@@ -2,7 +2,7 @@
   "target": ["cordova"],
   "mobile": ["ios", "android"],
   "ui": "bootstrap",
-  "features": ["auth", "e2e"],
+  "features": ["auth", "cypress"],
   "strict": true,
   "tools": ["jest"]
 }
diff --git a/scripts/tests/app/cordova/bootstrap.json b/scripts/tests/app/cordova/bootstrap.json
@@ -2,5 +2,6 @@
   "target": ["cordova"],
   "mobile": ["ios", "android"],
   "ui": "bootstrap",
-  "features": []
+  "features": [],
+  "tools": ["protractor"]
 }
diff --git a/scripts/tests/app/electron/ionic-authentication.json b/scripts/tests/app/electron/ionic-authentication.json
@@ -3,5 +3,6 @@
   "desktop": ["windows", "mac", "linux"],
   "ui": "ionic",
   "layout": "tabs",
-  "features": ["auth", "e2e"]
+  "features": ["auth"],
+  "tools": ["protractor"]
 }
diff --git a/scripts/tests/app/web+cordova/material-authentication.json b/scripts/tests/app/web+cordova/material-authentication.json
@@ -3,6 +3,7 @@
   "mobile": ["ios", "android"],
   "ui": "material",
   "layout": "simple",
-  "features": ["e2e", "auth", "lazy"],
+  "features": ["auth", "lazy"],
+  "tools": ["protractor"],
   "usePrefix": false
 }
diff --git a/scripts/tests/app/web/bootstrap.json b/scripts/tests/app/web/bootstrap.json
@@ -1,7 +1,7 @@
 {
   "target": ["web"],
   "ui": "bootstrap",
-  "features": ["angulartics", "e2e"],
+  "features": ["angulartics", "cypress"],
   "analyticsProvider": "ga",
   "googleAnalyticsAccount": "UA-116237171-1",
   "utility": ["ramda", "date-fns"]

diff --git a/scripts/tests/app/web/ionic-authentication.json b/scripts/tests/app/web/ionic-authentication.json
@@ -2,7 +2,7 @@
   "target": ["web"],
   "ui": "ionic",
   "layout": "side-menu",
-  "features": ["pwa", "auth", "lazy", "e2e"],
+  "features": ["pwa", "auth", "lazy", "cypress"],
   "location": "hash",
   "tools": ["jest"]
 }
diff --git a/scripts/tests/app/web/ionic.json b/scripts/tests/app/web/ionic.json
@@ -2,5 +2,5 @@
   "target": ["web"],
   "ui": "ionic",
   "layout": "tabs",
-  "features": ["lazy", "e2e"]
+  "features": ["lazy", "cypress"]
 }
diff --git a/scripts/tests/app/web/material-authentication.json b/scripts/tests/app/web/material-authentication.json
@@ -2,5 +2,5 @@
   "target": ["web"],
   "ui": "material",
   "layout": "simple",
-  "features": ["pwa", "auth", "e2e"]
+  "features": ["pwa", "auth", "cypress"]
 }
diff --git a/scripts/tests/app/web/material.json b/scripts/tests/app/web/material.json
@@ -2,7 +2,7 @@
   "target": ["web"],
   "ui": "material",
   "layout": "simple",
-  "features": ["e2e"],
+  "features": ["cypress"],
   "location": "hash",
   "tools": ["jest"]
 }
diff --git a/scripts/tests/app/web/raw-authentication.json b/scripts/tests/app/web/raw-authentication.json
@@ -1,5 +1,5 @@
 {
   "target": ["web"],
   "ui": "raw",
-  "features": ["auth", "e2e"]
+  "features": ["auth", "cypress"]
 }
diff --git a/scripts/tests/app/web/raw.json b/scripts/tests/app/web/raw.json
@@ -1,7 +1,7 @@
 {
   "target": ["web"],
   "ui": "raw",
-  "features": ["angulartics", "e2e"],
+  "features": ["angulartics", "cypress"],
   "analyticsProvider": "other",
   "tools": ["compodoc", "jest"],
   "utility": ["lodash", "moment"]