fix(cypress/schematic): add --e2e option. ensure binary is installed …

…in Angular 14 (#22922) Co-authored-by: Zachary Williams <zachjw34@gmail.com>
cypress-io · Aug 4, 2022 · 915859c · 915859c
1 parent c6ef180
commit 915859c
Show file tree

Hide file tree

Showing 42 changed files with 250 additions and 1,445 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1850,18 +1850,13 @@ jobs:
       - run:
           name: Build + Install
           command: |
-            yarn workspace @cypress/schematic build:all
+            yarn workspace @cypress/schematic build
           working_directory: npm/cypress-schematic
       - run:
           name: Run unit tests
           command: |
             yarn test
           working_directory: npm/cypress-schematic
-      - run:
-          name: Launch Sandbox and Install Schematic
-          command: |
-            yarn launch:test12
-          working_directory: npm/cypress-schematic
       - store-npm-logs
 
   npm-release:

diff --git a/npm/cypress-schematic/README.md b/npm/cypress-schematic/README.md
@@ -61,7 +61,7 @@ To generate new e2e spec files:
 
 ```shell script
 ng generate @cypress/schematic:e2e
-```
+``` 
 
 ## Builder Options 🛠
 

diff --git a/npm/cypress-schematic/package.json b/npm/cypress-schematic/package.json
@@ -5,39 +5,30 @@
   "main": "./src",
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "build:test": "tsc -p tsconfig.spec.json",
-    "build:all": "tsc -p tsconfig.json && tsc -p tsconfig.spec.json",
     "build:watch": "tsc -p tsconfig.json --watch",
-    "clean12": "git checkout HEAD -- sandbox12 && git clean -f -d sandbox12",
-    "launch12": "yarn link:sandbox12 && cd sandbox12 && ng add @cypress/schematic && cd ..",
-    "launch:test12": "yarn link:sandbox12 && cd sandbox12 && ng add @cypress/schematic --e2eUpdate && cd ..",
-    "link:sandbox12": "yarn link && cd sandbox12 && yarn link @cypress/schematic",
-    "test": "mocha -r @packages/ts/register --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json src/**/*.spec.ts",
-    "test:e2e:sandbox12": "cd sandbox12 && ng run sandbox:cypress-run",
-    "unlink:sandbox12": "cd sandbox12 && yarn unlink @cypress/schematic && cd .. && yarn unlink"
+    "test": "mocha -r @packages/ts/register --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json src/**/*.spec.ts"
   },
   "dependencies": {
-    "@angular-devkit/architect": "^0.1202.10",
-    "@angular-devkit/core": "^12.2.17",
-    "@angular-devkit/schematics": "^12.2.17",
-    "@schematics/angular": "^12.2.17",
+    "@angular-devkit/architect": "^0.1401.0",
+    "@angular-devkit/core": "^14.1.0",
+    "@angular-devkit/schematics": "^14.1.0",
+    "@schematics/angular": "^14.1.0",
     "jsonc-parser": "^3.0.0",
     "rxjs": "~6.6.0"
   },
   "devDependencies": {
-    "@angular-devkit/schematics-cli": "^12.2.17",
-    "@angular/cli": "^12.2.17",
+    "@angular-devkit/schematics-cli": "^14.1.0",
+    "@angular/cli": "^14.1.0",
     "@types/chai-enzyme": "0.6.7",
     "@types/mocha": "8.0.3",
-    "@types/node": "^12.11.1",
+    "@types/node": "^18.0.6",
     "chai": "4.2.0",
-    "cypress": "0.0.0-development",
     "mocha": "3.5.3",
-    "typescript": "~4.2.4"
+    "typescript": "~4.2.3"
   },
   "peerDependencies": {
-    "@angular/cli": ">=12",
-    "@angular/core": ">=12"
+    "@angular/cli": ">=14.1.0",
+    "@angular/core": ">=14.1.0"
   },
   "license": "MIT",
   "repository": {

diff --git a/npm/cypress-schematic/sandbox12/.browserslistrc b/npm/cypress-schematic/sandbox12/.browserslistrc
diff --git a/npm/cypress-schematic/sandbox12/.editorconfig b/npm/cypress-schematic/sandbox12/.editorconfig
diff --git a/npm/cypress-schematic/sandbox12/.gitignore b/npm/cypress-schematic/sandbox12/.gitignore
diff --git a/npm/cypress-schematic/sandbox12/README.md b/npm/cypress-schematic/sandbox12/README.md
diff --git a/npm/cypress-schematic/sandbox12/angular.json b/npm/cypress-schematic/sandbox12/angular.json
diff --git a/npm/cypress-schematic/sandbox12/karma.conf.js b/npm/cypress-schematic/sandbox12/karma.conf.js
diff --git a/npm/cypress-schematic/sandbox12/package.json b/npm/cypress-schematic/sandbox12/package.json
diff --git a/npm/cypress-schematic/sandbox12/src/app/app-routing.module.ts b/npm/cypress-schematic/sandbox12/src/app/app-routing.module.ts
diff --git a/npm/cypress-schematic/sandbox12/src/app/app.component.css b/npm/cypress-schematic/sandbox12/src/app/app.component.css