test(a12): removing no ivy mode

satanTime · Jan 30, 2022 · 95708aa · 95708aa
1 parent 623f50c
commit 95708aa
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 177 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -431,7 +431,7 @@ jobs:
           key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }}
           paths:
             - ./e2e/a12/node_modules
-  'Angular 12 without Ivy':
+  'Angular 12':
     docker:
       - image: satantime/puppeteer-node:12.22.9
     steps:
@@ -448,37 +448,13 @@ jobs:
           command: npm run s:test:a12
       - run:
           name: UT
-          command: npm run test:a12:off
+          command: npm run test:a12
       - run:
           name: E2E
-          command: npm run e2e:a12:off
+          command: npm run e2e:a12
       - run:
           name: Build
-          command: npm run b:a12:off
-  'Angular 12 with Ivy':
-    docker:
-      - image: satantime/puppeteer-node:12.22.9
-    steps:
-      - checkout
-      - attach_workspace:
-          at: dist
-      - restore_cache:
-          key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }}
-      - run:
-          name: Spreading Build
-          command: npm run s:a12
-      - run:
-          name: Spreading Tests
-          command: npm run s:test:a12
-      - run:
-          name: UT
-          command: npm run test:a12:on
-      - run:
-          name: E2E
-          command: npm run e2e:a12:on
-      - run:
-          name: Build
-          command: npm run b:a12:on
+          command: npm run b:a12
   'Angular 13 Install':
     docker:
       - image: satantime/puppeteer-node:12.22.9
@@ -639,10 +615,7 @@ workflows:
       - 'Angular 12 Install':
           requires:
             - Core
-      - 'Angular 12 without Ivy':
-          requires:
-            - Angular 12 Install
-      - 'Angular 12 with Ivy':
+      - 'Angular 12':
           requires:
             - Angular 12 Install
       - 'Angular 13 Install':

diff --git a/e2e/a12/angular.json b/e2e/a12/angular.json
@@ -18,65 +18,34 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist/a12",
+            "tsConfig": "tsconfig.json",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "aot": true,
-            "progress": false,
-            "assets": ["src/favicon.ico", "src/assets"],
-            "styles": ["src/styles.css"],
-            "scripts": []
-          },
-          "configurations": {
-            "ivy-on": {
-              "tsConfig": "tsconfig.ivy-on.json"
-            },
-            "ivy-off": {
-              "tsConfig": "tsconfig.ivy-off.json"
-            }
+            "progress": false
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
-          "configurations": {
-            "ivy-on": {
-              "browserTarget": "a12:build:ivy-on"
-            },
-            "ivy-off": {
-              "browserTarget": "a12:build:ivy-off"
-            }
+          "options": {
+            "browserTarget": "a12:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
+            "tsConfig": "tsconfig.json",
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "karmaConfig": "karma.conf.js",
-            "assets": ["src/favicon.ico", "src/assets"],
-            "styles": ["src/styles.css"],
-            "scripts": []
-          },
-          "configurations": {
-            "ivy-on": {
-              "tsConfig": "tsconfig.ivy-on.json"
-            },
-            "ivy-off": {
-              "tsConfig": "tsconfig.ivy-off.json"
-            }
+            "karmaConfig": "karma.conf.js"
           }
         },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
-          "configurations": {
-            "ivy-on": {
-              "devServerTarget": "a12:serve:ivy-on",
-              "protractorConfig": "e2e/protractor.ivy-on.js"
-            },
-            "ivy-off": {
-              "devServerTarget": "a12:serve:ivy-off",
-              "protractorConfig": "e2e/protractor.ivy-off.js"
-            }
+          "options": {
+            "devServerTarget": "a12:serve",
+            "protractorConfig": "e2e/protractor.js"
           }
         }
       }

diff --git a/e2e/a12/e2e/protractor.ivy-off.js b/e2e/a12/e2e/protractor.ivy-off.js
diff --git a/e2e/a12/e2e/protractor.ivy-on.js → e2e/a12/e2e/protractor.js b/e2e/a12/e2e/protractor.ivy-on.js → e2e/a12/e2e/protractor.js
@@ -28,7 +28,7 @@ exports.config = {
     },
     onPrepare() {
         require('ts-node').register({
-            project: require('path').join(__dirname, 'tsconfig.ivy-on.json'),
+            project: require('path').join(__dirname, 'tsconfig.json'),
         });
         jasmine.getEnv().addReporter(
             new SpecReporter({

diff --git a/e2e/a12/e2e/tsconfig.ivy-off.json b/e2e/a12/e2e/tsconfig.ivy-off.json
diff --git a/e2e/a12/e2e/tsconfig.ivy-on.json → e2e/a12/e2e/tsconfig.json b/e2e/a12/e2e/tsconfig.ivy-on.json → e2e/a12/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.ivy-on.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
     "types": ["jasmine", "jasminewd2", "node"]

diff --git a/e2e/a12/package.json b/e2e/a12/package.json
@@ -4,15 +4,9 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "npm run build:ivy-on && npm run build:ivy-off",
-    "build:ivy-on": "ng build --configuration ivy-on",
-    "build:ivy-off": "ng build --configuration ivy-off",
-    "test": "npm run test:ivy-on && npm run test:ivy-off",
-    "test:ivy-on": "ng test --configuration ivy-on",
-    "test:ivy-off": "ng test --configuration ivy-off",
-    "e2e": "npm run e2e:ivy-on && npm run e2e:ivy-off",
-    "e2e:ivy-on": "ng e2e --webdriver-update=false --configuration ivy-on",
-    "e2e:ivy-off": "ng e2e --webdriver-update=false --configuration ivy-off",
+    "build": "ng build",
+    "test": "ng test",
+    "e2e": "ng e2e --webdriver-update=false",
     "postinstall": "webdriver-manager update --versions.chrome 93.0.4577.63 --gecko=false"
   },
   "private": true,

diff --git a/e2e/a12/src/assets/.gitkeep b/e2e/a12/src/assets/.gitkeep
diff --git a/e2e/a12/src/environments/environment.prod.ts b/e2e/a12/src/environments/environment.prod.ts
diff --git a/e2e/a12/src/environments/environment.ts b/e2e/a12/src/environments/environment.ts
diff --git a/e2e/a12/src/favicon.ico b/e2e/a12/src/favicon.ico
diff --git a/e2e/a12/src/main.ts b/e2e/a12/src/main.ts
@@ -2,11 +2,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import {AppModule} from './app/app.module';
-import {environment} from './environments/environment';
-
-if (environment.production) {
-    enableProdMode();
-}
+enableProdMode();
 
 platformBrowserDynamic()
     .bootstrapModule(AppModule)

diff --git a/e2e/a12/src/styles.css b/e2e/a12/src/styles.css
diff --git a/e2e/a12/tsconfig.ivy-off.json b/e2e/a12/tsconfig.ivy-off.json
diff --git a/e2e/a12/tsconfig.ivy-on.json b/e2e/a12/tsconfig.ivy-on.json
diff --git a/package.json b/package.json
@@ -86,9 +86,7 @@
     "b:a11": "npm run b:a11:off && npm run b:a11:on",
     "b:a11:off": "cd e2e/a11 && npm run build:ivy-off && rm -Rf dist",
     "b:a11:on": "cd e2e/a11 && npm run build:ivy-on && rm -Rf dist",
-    "b:a12": "npm run b:a12:off && npm run b:a12:on",
-    "b:a12:off": "cd e2e/a12 && npm run build:ivy-off && rm -Rf dist",
-    "b:a12:on": "cd e2e/a12 && npm run build:ivy-on && rm -Rf dist",
+    "b:a12": "cd e2e/a12 && npm run build && rm -Rf dist",
     "b:a13": "cd e2e/a13 && npm run build && rm -Rf dist",
     "b:r7": "cd e2e/r7 && npm run build && rm -Rf build",
     "e2e:a": "npm run e2e:a6 && npm run e2e:a7 && npm run e2e:a8 && npm run e2e:a9 && npm run e2e:a10 && npm run e2e:a11 && npm run e2e:a12 && npm run e2e:a13",
@@ -104,9 +102,7 @@
     "e2e:a11": "npm run e2e:a11:off && npm run e2e:a11:on",
     "e2e:a11:off": "cd e2e/a11 && npm run e2e:ivy-off",
     "e2e:a11:on": "cd e2e/a11 && npm run e2e:ivy-on",
-    "e2e:a12": "npm run e2e:a12:off && npm run e2e:a12:on",
-    "e2e:a12:off": "cd e2e/a12 && npm run e2e:ivy-off",
-    "e2e:a12:on": "cd e2e/a12 && npm run e2e:ivy-on",
+    "e2e:a12": "cd e2e/a12 && npm run e2e",
     "e2e:a13": "cd e2e/a13 && npm run e2e",
     "test:a": "npm run test:a6 && npm run test:a7 &&npm run test:a8 && npm run test:a9 && npm run test:a10 && npm run test:a11 && npm run test:a12 && npm run test:a13 && npm run test:r7",
     "test:a6": "cd e2e/a6 && npm run test",
@@ -121,9 +117,7 @@
     "test:a11": "npm run test:a11:off && npm run test:a11:on",
     "test:a11:off": "cd e2e/a11 && npm run test:ivy-off",
     "test:a11:on": "cd e2e/a11 && npm run test:ivy-on",
-    "test:a12": "npm run test:a12:off && npm run test:a12:on",
-    "test:a12:off": "cd e2e/a12 && npm run test:ivy-off",
-    "test:a12:on": "cd e2e/a12 && npm run test:ivy-on",
+    "test:a12": "cd e2e/a12 && npm run test",
     "test:a13": "cd e2e/a13 && npm run test",
     "test:r7": "cd e2e/r7 && CI=1 npm run test"
   },