test: remove Ivy/ViewEngine switch helpers and obsolete tests (angular#44120)

This commit removes special functions that were used to run tests in ViewEngine or Ivy only.
Since ViewEngine is deprecated and we no longer run ViewEngine tests on CI, we can cleanup
those special helpers and ViewEngine-only tests.

PR Close angular#44120

Author: AndrewKushnir

packages/bazel/test/ngc-wrapped/flat_module_test.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {obsoleteInIvy, onlyInIvy} from '@angular/private/testing';
 import {runfiles} from '@bazel/runfiles';
 import {existsSync, readFileSync} from 'fs';
 import {dirname, join} from 'path';
@@ -26,15 +25,8 @@ describe('flat_module ng_module', () => {
   });
 
   describe('flat module out file', () => {
-    obsoleteInIvy('Ngtsc computes the AMD module name differently than NGC')
-        .it('should have a proper AMD module name', () => {
-          expect(readFileSync(flatModuleOutFile, 'utf8'))
-              .toContain(`define("flat_module/flat_module"`);
-        });
-
-    onlyInIvy('Ngtsc computes the AMD module name differently than NGC')
-        .it('should have a proper AMD module name', () => {
-          expect(readFileSync(flatModuleOutFile, 'utf8')).toContain(`define("flat_module"`);
-        });
+    it('should have a proper AMD module name', () => {
+      expect(readFileSync(flatModuleOutFile, 'utf8')).toContain(`define("flat_module"`);
+    });
   });
 });

packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/module_spec.ts

@@ -7,10 +7,9 @@
  */
 
 import {forwardRef, Injectable, InjectionToken, Injector, NgModule, ɵcreateInjector as createInjector} from '@angular/core';
-import {ivyEnabled} from '@angular/private/testing';
 import {AOT_TOKEN, AotModule, AotService} from 'app_built/src/module';
 
-describe('Ivy NgModule', () => {
+describe('NgModule', () => {
   describe('AOT', () => {
     let injector: Injector;
 
@@ -62,12 +61,11 @@ describe('Ivy NgModule', () => {
       class BModule {
       }
 
-      const errorCode = ivyEnabled ? 'NG0200: ' : '';
-      const errorLink = ivyEnabled ? '. Find more at https://angular.io/errors/NG0200' : '';
       expect(() => createInjector(AModule))
-          .toThrowError(`${
-              errorCode}Circular dependency in DI detected for AModule. Dependency path: AModule > BModule > AModule${
-              errorLink}`);
+          .toThrowError(
+              'NG0200: Circular dependency in DI detected for AModule. ' +
+              'Dependency path: AModule > BModule > AModule. ' +
+              'Find more at https://angular.io/errors/NG0200');
     });
 
     it('merges imports and exports', () => {

packages/core/test/acceptance/bootstrap_spec.ts

@@ -9,7 +9,7 @@
 import {ApplicationRef, COMPILER_OPTIONS, Component, destroyPlatform, NgModule, NgZone, TestabilityRegistry, ViewEncapsulation} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {onlyInIvy, withBody} from '@angular/private/testing';
+import {withBody} from '@angular/private/testing';
 
 describe('bootstrap', () => {
   beforeEach(destroyPlatform);
@@ -242,7 +242,7 @@ describe('bootstrap', () => {
          }));
     });
 
-    onlyInIvy('options cannot be changed in Ivy').describe('changing bootstrap options', () => {
+    describe('changing bootstrap options', () => {
       beforeEach(() => {
         spyOn(console, 'error');
       });

packages/core/test/acceptance/change_detection_spec.ts

@@ -11,7 +11,6 @@ import {CommonModule} from '@angular/common';
 import {ApplicationRef, ChangeDetectionStrategy, ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, Directive, DoCheck, EmbeddedViewRef, ErrorHandler, EventEmitter, Input, NgModule, OnInit, Output, QueryList, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
 import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {ivyEnabled} from '@angular/private/testing';
 import {BehaviorSubject} from 'rxjs';
 
 describe('change detection', () => {
@@ -1122,7 +1121,7 @@ describe('change detection', () => {
              template: ` <ng-container [ngTemplateOutlet]="template"> </ng-container> `
            })
            class Insertion {
-             @Input() template !: TemplateRef<{}>;
+             @Input() template!: TemplateRef<{}>;
            }
 
            // This component uses async pipe (which calls markForCheck) in a view that has different
@@ -1398,34 +1397,29 @@ describe('change detection', () => {
     }
 
     it('should include field name in case of property binding', () => {
-      const message = ivyEnabled ? `Previous value for 'id': 'initial'. Current value: 'changed'` :
-                                   `Previous value: 'id: initial'. Current value: 'id: changed'`;
+      const message = `Previous value for 'id': 'initial'. Current value: 'changed'`;
       expect(() => initWithTemplate('<div [id]="unstableStringExpression"></div>'))
           .toThrowError(new RegExp(message));
     });
 
     it('should include field name in case of property interpolation', () => {
-      const message = ivyEnabled ?
-          `Previous value for 'id': 'Expressions: a and initial!'. Current value: 'Expressions: a and changed!'` :
-          `Previous value: 'id: Expressions: a and initial!'. Current value: 'id: Expressions: a and changed!'`;
+      const message =
+          `Previous value for 'id': 'Expressions: a and initial!'. Current value: 'Expressions: a and changed!'`;
       expect(
           () => initWithTemplate(
               '<div id="Expressions: {{ a }} and {{ unstableStringExpression }}!"></div>'))
           .toThrowError(new RegExp(message));
     });
 
     it('should include field name in case of attribute binding', () => {
-      const message = ivyEnabled ?
-          `Previous value for 'attr.id': 'initial'. Current value: 'changed'` :
-          `Previous value: 'id: initial'. Current value: 'id: changed'`;
+      const message = `Previous value for 'attr.id': 'initial'. Current value: 'changed'`;
       expect(() => initWithTemplate('<div [attr.id]="unstableStringExpression"></div>'))
           .toThrowError(new RegExp(message));
     });
 
     it('should include field name in case of attribute interpolation', () => {
-      const message = ivyEnabled ?
-          `Previous value for 'attr.id': 'Expressions: a and initial!'. Current value: 'Expressions: a and changed!'` :
-          `Previous value: 'id: Expressions: a and initial!'. Current value: 'id: Expressions: a and changed!'`;
+      const message =
+          `Previous value for 'attr.id': 'Expressions: a and initial!'. Current value: 'Expressions: a and changed!'`;
       expect(
           () => initWithTemplate(
               '<div attr.id="Expressions: {{ a }} and {{ unstableStringExpression }}!"></div>'))
@@ -1450,16 +1444,13 @@ describe('change detection', () => {
        });
 
     it('should include style prop name in case of style binding', () => {
-      const message = ivyEnabled ? `Previous value for 'color': 'red'. Current value: 'green'` :
-                                   `Previous value: 'color: red'. Current value: 'color: green'`;
+      const message = `Previous value for 'color': 'red'. Current value: 'green'`;
       expect(() => initWithTemplate('<div [style.color]="unstableColorExpression"></div>'))
           .toThrowError(new RegExp(message));
     });
 
     it('should include class name in case of class binding', () => {
-      const message = ivyEnabled ?
-          `Previous value for 'someClass': 'true'. Current value: 'false'` :
-          `Previous value: 'someClass: true'. Current value: 'someClass: false'`;
+      const message = `Previous value for 'someClass': 'true'. Current value: 'false'`;
       expect(() => initWithTemplate('<div [class.someClass]="unstableBooleanExpression"></div>'))
           .toThrowError(new RegExp(message));
     });
@@ -1480,23 +1471,19 @@ describe('change detection', () => {
        });
 
     it('should include field name in case of host property binding', () => {
-      const message = ivyEnabled ? `Previous value for 'id': 'initial'. Current value: 'changed'` :
-                                   `Previous value: 'id: initial'. Current value: 'id: changed'`;
+      const message = `Previous value for 'id': 'initial'. Current value: 'changed'`;
       expect(() => initWithHostBindings({'[id]': 'unstableStringExpression'}))
           .toThrowError(new RegExp(message));
     });
 
     it('should include style prop name in case of host style bindings', () => {
-      const message = ivyEnabled ? `Previous value for 'color': 'red'. Current value: 'green'` :
-                                   `Previous value: 'color: red'. Current value: 'color: green'`;
+      const message = `Previous value for 'color': 'red'. Current value: 'green'`;
       expect(() => initWithHostBindings({'[style.color]': 'unstableColorExpression'}))
           .toThrowError(new RegExp(message));
     });
 
     it('should include class name in case of host class bindings', () => {
-      const message = ivyEnabled ?
-          `Previous value for 'someClass': 'true'. Current value: 'false'` :
-          `Previous value: 'someClass: true'. Current value: 'someClass: false'`;
+      const message = `Previous value for 'someClass': 'true'. Current value: 'false'`;
       expect(() => initWithHostBindings({'[class.someClass]': 'unstableBooleanExpression'}))
           .toThrowError(new RegExp(message));
     });

packages/core/test/acceptance/change_detection_transplanted_view_spec.ts

@@ -11,7 +11,6 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DoCheck, Input, T
 import {AfterViewChecked} from '@angular/core/src/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {onlyInIvy} from '@angular/private/testing';
 
 describe('change detection for transplanted views', () => {
   describe('when declaration appears before insertion', () => {
@@ -324,7 +323,7 @@ describe('change detection for transplanted views', () => {
       changeDetection: ChangeDetectionStrategy.OnPush
     })
     class Insertion {
-      @Input() template !: TemplateRef<{}>;
+      @Input() template!: TemplateRef<{}>;
       name = 'initial';
       constructor(readonly changeDetectorRef: ChangeDetectorRef) {}
     }
@@ -479,7 +478,7 @@ describe('change detection for transplanted views', () => {
       template: `<ng-container [ngTemplateOutlet]="template"></ng-container>`
     })
     class CheckAlwaysInsertion {
-      @Input() template !: TemplateRef<{}>;
+      @Input() template!: TemplateRef<{}>;
     }
 
     @Component({
@@ -488,7 +487,7 @@ describe('change detection for transplanted views', () => {
       changeDetection: ChangeDetectionStrategy.OnPush
     })
     class OnPushInsertionHost {
-      @Input() template !: TemplateRef<{}>;
+      @Input() template!: TemplateRef<{}>;
       constructor(readonly cdr: ChangeDetectorRef) {}
     }
     @Component({
@@ -542,7 +541,7 @@ describe('change detection for transplanted views', () => {
       expect(fixture.nativeElement.textContent).toEqual('new');
     });
 
-    onlyInIvy('behavior is inconsistent in VE').describe('when insertion is detached', () => {
+    describe('when insertion is detached', () => {
       it('does not refresh CheckAlways transplants', () => {
         const fixture = getFixture(CheckAlwaysDeclaration);
         fixture.detectChanges();
@@ -570,7 +569,7 @@ describe('change detection for transplanted views', () => {
       changeDetection: ChangeDetectionStrategy.OnPush
     })
     class TripleTemplate {
-      @Input() template !: TemplateRef<{}>;
+      @Input() template!: TemplateRef<{}>;
     }
 
     @Component({

packages/core/test/acceptance/component_spec.ts

@@ -11,7 +11,6 @@ import {ApplicationRef, Component, ComponentFactoryResolver, ComponentRef, Eleme
 import {TestBed} from '@angular/core/testing';
 import {ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {ivyEnabled, onlyInIvy} from '@angular/private/testing';
 
 import {domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {global} from '../../src/util/global';
@@ -388,18 +387,9 @@ describe('component', () => {
       }
 
       TestBed.configureTestingModule({declarations: [App, Comp]});
-      if (ivyEnabled) {
-        expect(() => TestBed.createComponent(App))
-            .toThrowError(
-                /"ng-container" tags cannot be used as component hosts. Please use a different tag to activate the Comp component/);
-      } else {
-        // In VE there is no special check for the case when `<ng-container>` is used as a host
-        // element for a Component. VE tries to attach Component's content to a Comment node that
-        // represents the `<ng-container>` location and this call fails with a
-        // browser/environment-specific error message, so we just verify that this scenario is
-        // triggering an error in VE.
-        expect(() => TestBed.createComponent(App)).toThrow();
-      }
+      expect(() => TestBed.createComponent(App))
+          .toThrowError(
+              /"ng-container" tags cannot be used as component hosts. Please use a different tag to activate the Comp component/);
     });
 
     it('should throw when <ng-template> is used as a host element for a Component', () => {
@@ -418,15 +408,9 @@ describe('component', () => {
       }
 
       TestBed.configureTestingModule({declarations: [App, Comp]});
-      if (ivyEnabled) {
-        expect(() => TestBed.createComponent(App))
-            .toThrowError(
-                /"ng-template" tags cannot be used as component hosts. Please use a different tag to activate the Comp component/);
-      } else {
-        expect(() => TestBed.createComponent(App))
-            .toThrowError(
-                /Components on an embedded template: Comp \("\[ERROR ->\]<ng-template><\/ng-template>"\)/);
-      }
+      expect(() => TestBed.createComponent(App))
+          .toThrowError(
+              /"ng-template" tags cannot be used as component hosts. Please use a different tag to activate the Comp component/);
     });
   });
 
@@ -702,9 +686,7 @@ describe('component', () => {
     it('with Renderer2',
        () => runTestWithRenderer([{provide: RendererFactory2, useClass: DomRendererFactory2}]));
 
-    onlyInIvy('Renderer3 is supported only in Ivy')
-        .it('with Renderer3',
-            () =>
-                runTestWithRenderer([{provide: RendererFactory2, useValue: domRendererFactory3}]));
+    it('with Renderer3',
+       () => runTestWithRenderer([{provide: RendererFactory2, useValue: domRendererFactory3}]));
   });
 });