refactor(core): remove test.ts files in integration tests

These files are not necessary since CLI v15+
cexbrayat · Oct 8, 2023 · 94f227e · 94f227e
1 parent 00128e3
commit 94f227e
Show file tree

Hide file tree

Showing 38 changed files with 22 additions and 249 deletions.
diff --git a/integration/animations-async/angular.json b/integration/animations-async/angular.json
@@ -84,7 +84,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing"

diff --git a/integration/animations-async/src/test.ts b/integration/animations-async/src/test.ts
diff --git a/integration/animations-async/tsconfig.spec.json b/integration/animations-async/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/animations/angular.json b/integration/animations/angular.json
@@ -84,7 +84,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing"

diff --git a/integration/animations/src/test.ts b/integration/animations/src/test.ts
diff --git a/integration/animations/tsconfig.spec.json b/integration/animations/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/cli-elements-universal/angular.json b/integration/cli-elements-universal/angular.json
@@ -81,9 +81,9 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
-              "zone.js"
+              "zone.js",
+              "zone.js/testing"
             ],
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",

diff --git a/integration/cli-elements-universal/src/test.ts b/integration/cli-elements-universal/src/test.ts
diff --git a/integration/cli-elements-universal/tsconfig.spec.json b/integration/cli-elements-universal/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "jasmine"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/cli-hello-world-ivy-i18n/angular.json b/integration/cli-hello-world-ivy-i18n/angular.json
@@ -96,7 +96,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing",

diff --git a/integration/cli-hello-world-ivy-i18n/src/test.ts b/integration/cli-hello-world-ivy-i18n/src/test.ts
diff --git a/integration/cli-hello-world-ivy-i18n/tsconfig.spec.json b/integration/cli-hello-world-ivy-i18n/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/cli-hello-world-lazy/angular.json b/integration/cli-hello-world-lazy/angular.json
@@ -72,7 +72,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing"

diff --git a/integration/cli-hello-world-lazy/src/test.ts b/integration/cli-hello-world-lazy/src/test.ts
diff --git a/integration/cli-hello-world-lazy/tsconfig.spec.json b/integration/cli-hello-world-lazy/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/cli-hello-world-mocha/angular.json b/integration/cli-hello-world-mocha/angular.json
@@ -79,7 +79,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing"

diff --git a/integration/cli-hello-world-mocha/src/test.ts b/integration/cli-hello-world-mocha/src/test.ts
diff --git a/integration/cli-hello-world-mocha/tsconfig.spec.json b/integration/cli-hello-world-mocha/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/cli-hello-world/angular.json b/integration/cli-hello-world/angular.json
@@ -79,7 +79,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing"

diff --git a/integration/cli-hello-world/src/test.ts b/integration/cli-hello-world/src/test.ts
diff --git a/integration/cli-hello-world/tsconfig.spec.json b/integration/cli-hello-world/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/defer/angular.json b/integration/defer/angular.json
@@ -80,9 +80,9 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
-              "zone.js"
+              "zone.js",
+              "zone.js/testing"
             ],
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",

diff --git a/integration/defer/src/test.ts b/integration/defer/src/test.ts
diff --git a/integration/defer/tsconfig.spec.json b/integration/defer/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/forms/angular.json b/integration/forms/angular.json
@@ -79,7 +79,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": [
               "zone.js",
               "zone.js/testing"

diff --git a/integration/forms/src/app/app.component.spec.ts b/integration/forms/src/app/app.component.spec.ts
@@ -1,14 +1,14 @@
-import {TestBed, waitForAsync} from '@angular/core/testing';
-import {AppComponent} from './app.component';
+import {TestBed} from '@angular/core/testing';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {AppComponent, ReactiveFormsComponent, TemplateFormsComponent} from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(waitForAsync(() => {
-    TestBed
-        .configureTestingModule({
-          declarations: [AppComponent],
-        })
-        .compileComponents();
-  }));
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AppComponent, TemplateFormsComponent, ReactiveFormsComponent],
+      imports: [FormsModule, ReactiveFormsModule]
+    }).compileComponents();
+  });
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);

diff --git a/integration/forms/src/test.ts b/integration/forms/src/test.ts
diff --git a/integration/forms/tsconfig.spec.json b/integration/forms/tsconfig.spec.json
@@ -7,9 +7,6 @@
       "node"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

diff --git a/integration/ivy-i18n/angular.json b/integration/ivy-i18n/angular.json
@@ -111,8 +111,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": ["zone.js/testing", "src/polyfills.ts"],
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": ["src/favicon.ico", "src/assets"],

diff --git a/integration/ivy-i18n/src/app/app.component.spec.ts b/integration/ivy-i18n/src/app/app.component.spec.ts
@@ -1,14 +1,12 @@
-import {TestBed, async} from '@angular/core/testing';
+import {TestBed} from '@angular/core/testing';
 import {AppComponent} from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed
-        .configureTestingModule({
-          declarations: [AppComponent],
-        })
-        .compileComponents();
-  }));
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AppComponent],
+    }).compileComponents();
+  });
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);

diff --git a/integration/ivy-i18n/src/test.ts b/integration/ivy-i18n/src/test.ts
diff --git a/integration/ivy-i18n/tsconfig.spec.json b/integration/ivy-i18n/tsconfig.spec.json
@@ -8,7 +8,6 @@
     ]
   },
   "files": [
-    "src/test.ts",
     "src/polyfills.ts"
   ],
   "include": [