refactor(core): remove withBody from public testing API (angular#25171)

PR Close angular#25171
Employfromhome · Jul 31, 2018 · 6e2a187 · 6e2a187
1 parent aafd502
commit 6e2a187
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 16 deletions.
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
@@ -27,6 +27,7 @@ ts_library(
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
+        "//packages/private/testing",
         "//packages/router",
         "//packages/router/testing",
         "@rxjs",

diff --git a/packages/core/test/application_ref_integration_spec.ts b/packages/core/test/application_ref_integration_spec.ts
@@ -7,8 +7,9 @@
  */
 
 import {ApplicationModule, ApplicationRef, DoCheck, InjectFlags, InjectorType, Input, OnInit, PlatformRef, TestabilityRegistry, Type, defineInjector, inject, ɵE as elementStart, ɵNgModuleDef as NgModuleDef, ɵRenderFlags as RenderFlags, ɵT as text, ɵdefineComponent as defineComponent, ɵe as elementEnd, ɵi1 as interpolation1, ɵt as textBinding} from '@angular/core';
-import {getTestBed, withBody} from '@angular/core/testing';
+import {getTestBed} from '@angular/core/testing';
 import {BrowserModule, EVENT_MANAGER_PLUGINS, platformBrowser} from '@angular/platform-browser';
+import {withBody} from '@angular/private/testing';
 
 import {BROWSER_MODULE_PROVIDERS} from '../../platform-browser/src/browser';
 import {APPLICATION_MODULE_PROVIDERS} from '../src/application_module';

diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -38,6 +38,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/core/testing",
+        "//packages/private/testing",
     ],
 )
 

diff --git a/packages/core/test/bundling/hello_world/treeshaking_spec.ts b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {withBody} from '@angular/core/testing';
+import {withBody} from '@angular/private/testing';
 import * as fs from 'fs';
 import * as path from 'path';
 

diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
@@ -38,6 +38,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/core/testing",
+        "//packages/private/testing",
     ],
 )
 

diff --git a/packages/core/test/bundling/injection/BUILD.bazel b/packages/core/test/bundling/injection/BUILD.bazel
@@ -39,6 +39,7 @@ ts_library(
         ":injection",
         "//packages:types",
         "//packages/core/testing",
+        "//packages/private/testing",
     ],
 )
 

diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
@@ -44,6 +44,7 @@ ts_library(
         "//packages:types",
         "//packages/core",
         "//packages/core/testing",
+        "//packages/private/testing",
     ],
 )
 

diff --git a/packages/core/test/bundling/todo/todo_e2e_spec.ts b/packages/core/test/bundling/todo/todo_e2e_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {ɵwhenRendered as whenRendered} from '@angular/core';
-import {withBody} from '@angular/core/testing';
+import {withBody} from '@angular/private/testing';
 import * as fs from 'fs';
 import * as path from 'path';
 

diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
@@ -27,6 +27,7 @@ ts_library(
         "//packages/platform-browser",
         "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
+        "//packages/private/testing",
     ],
 )
 

diff --git a/packages/core/test/render3/change_detection_spec.ts b/packages/core/test/render3/change_detection_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {withBody} from '@angular/core/testing';
+import {withBody} from '@angular/private/testing';
 
 import {ChangeDetectionStrategy, ChangeDetectorRef, DoCheck} from '../../src/core';
 import {getRenderedText, whenRendered} from '../../src/render3/component';

diff --git a/packages/core/test/render3/compiler_canonical/small_app_spec.ts b/packages/core/test/render3/compiler_canonical/small_app_spec.ts
@@ -8,7 +8,7 @@
 
 import {NgForOf, NgForOfContext} from '@angular/common';
 import {Component, ContentChild, Directive, EventEmitter, Injectable, Input, NgModule, OnDestroy, Optional, Output, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, defineInjectable, defineInjector} from '@angular/core';
-import {withBody} from '@angular/core/testing';
+import {withBody} from '@angular/private/testing';
 
 import * as r3 from '../../../src/render3/index';
 

diff --git a/packages/core/test/render3/testing_spec.ts b/packages/core/test/render3/testing_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {withBody} from '@angular/core/testing';
+import {withBody} from '@angular/private/testing';
 
 describe('testing', () => {
   describe('withBody', () => {

diff --git a/packages/core/testing/src/testing.ts b/packages/core/testing/src/testing.ts
@@ -19,4 +19,3 @@ export * from './test_bed';
 export * from './before_each';
 export * from './metadata_override';
 export * from './private_export_testing';
-export * from './render3';
diff --git a/packages/private/testing/BUILD.bazel b/packages/private/testing/BUILD.bazel
@@ -0,0 +1,16 @@
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["package.json"])
+
+load("//tools:defaults.bzl", "ng_module")
+
+ng_module(
+    name = "testing",
+    srcs = glob(
+        ["**/*.ts"],
+    ),
+    module_name = "@angular/private/testing",
+    deps = [
+        "//packages/core",
+    ],
+)
diff --git a/packages/private/testing/index.ts b/packages/private/testing/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './src/render3';
diff --git a/packages/core/testing/src/render3.ts → packages/private/testing/src/render3.ts b/packages/core/testing/src/render3.ts → packages/private/testing/src/render3.ts
diff --git a/test-main.js b/test-main.js
@@ -62,6 +62,7 @@ System.config({
     '@angular/platform-server': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/private/testing': {main: 'index.js', defaultExtension: 'js'},
     '@angular/elements': {main: 'index.js', defaultExtension: 'js'},
     'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'},
     'rxjs/operators': {main: 'index.js', defaultExtension: 'js'},

diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
@@ -1,8 +1,5 @@
 export declare function async(fn: Function): (done: any) => any;
 
-/** @experimental */
-export declare function cleanupDocument(): void;
-
 export declare class ComponentFixture<T> {
     changeDetectorRef: ChangeDetectorRef;
     componentInstance: T;
@@ -30,9 +27,6 @@ export declare const ComponentFixtureNoNgZone: InjectionToken<boolean[]>;
 /** @experimental */
 export declare function discardPeriodicTasks(): void;
 
-/** @experimental */
-export declare function ensureDocument(): void;
-
 /** @experimental */
 export declare function fakeAsync(fn: Function): (...args: any[]) => any;
 
@@ -147,9 +141,6 @@ export declare type TestModuleMetadata = {
 /** @experimental */
 export declare function tick(millis?: number): void;
 
-/** @experimental */
-export declare function withBody<T extends Function>(html: string, blockFn: T): T;
-
 /** @experimental */
 export declare function withModule(moduleDef: TestModuleMetadata): InjectSetupWrapper;
 export declare function withModule(moduleDef: TestModuleMetadata, fn: Function): () => any;