diff --git a/packages/forms/test/directives_spec.ts b/packages/forms/test/directives_spec.ts index 79f78101a0a..cca4816bc23 100644 --- a/packages/forms/test/directives_spec.ts +++ b/packages/forms/test/directives_spec.ts @@ -39,8 +39,8 @@ import { } from '../index'; import {selectValueAccessor} from '../src/directives/shared'; import {composeValidators} from '../src/validators'; - -import {asyncValidator, timeout, useAutoTick} from './util'; +import {useAutoTick, timeout} from '@angular/private/testing'; +import {asyncValidator} from './util'; class DummyControlValueAccessor implements ControlValueAccessor { writtenValue: any; diff --git a/packages/forms/test/form_array_spec.ts b/packages/forms/test/form_array_spec.ts index c0721a5975e..8cc1062aff3 100644 --- a/packages/forms/test/form_array_spec.ts +++ b/packages/forms/test/form_array_spec.ts @@ -17,7 +17,8 @@ import { import {Validators} from '../src/validators'; import {of} from 'rxjs'; -import {asyncValidator, timeout, useAutoTick} from './util'; +import {useAutoTick, timeout} from '@angular/private/testing'; +import {asyncValidator} from './util'; (function () { describe('FormArray', () => { diff --git a/packages/forms/test/form_builder_spec.ts b/packages/forms/test/form_builder_spec.ts index ba217b893d1..fa0878f3738 100644 --- a/packages/forms/test/form_builder_spec.ts +++ b/packages/forms/test/form_builder_spec.ts @@ -15,7 +15,7 @@ import { Validators, } from '../index'; import {of} from 'rxjs'; -import {timeout, useAutoTick} from './util'; +import {useAutoTick, timeout} from '@angular/private/testing'; (function () { function syncValidator() { diff --git a/packages/forms/test/form_control_spec.ts b/packages/forms/test/form_control_spec.ts index 91377f2f20d..5f23171e6ce 100644 --- a/packages/forms/test/form_control_spec.ts +++ b/packages/forms/test/form_control_spec.ts @@ -8,7 +8,8 @@ import {AsyncValidatorFn, FormArray, FormControl, FormGroup, Validators} from '../index'; -import {asyncValidator, asyncValidatorReturningObservable, timeout, useAutoTick} from './util'; +import {asyncValidator, asyncValidatorReturningObservable} from './util'; +import {useAutoTick, timeout} from '@angular/private/testing'; (function () { function otherAsyncValidator() { diff --git a/packages/forms/test/form_group_spec.ts b/packages/forms/test/form_group_spec.ts index 87046f7ddc6..41703f15cb4 100644 --- a/packages/forms/test/form_group_spec.ts +++ b/packages/forms/test/form_group_spec.ts @@ -17,6 +17,7 @@ import { Validators, ValueChangeEvent, } from '../index'; +import {useAutoTick, timeout} from '@angular/private/testing'; import {FormControlStatus, StatusChangeEvent} from '../src/model/abstract_model'; import { @@ -24,8 +25,6 @@ import { asyncValidatorReturningObservable, currentStateOf, simpleAsyncValidator, - timeout, - useAutoTick, } from './util'; (function () { diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts index dc94b3f1cde..7e2b0dad363 100644 --- a/packages/forms/test/reactive_integration_spec.ts +++ b/packages/forms/test/reactive_integration_spec.ts @@ -19,7 +19,13 @@ import { } from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; -import {dispatchEvent, isNode, sortedClassList} from '@angular/private/testing'; +import { + dispatchEvent, + isNode, + sortedClassList, + useAutoTick, + timeout, +} from '@angular/private/testing'; import {expect} from '@angular/private/testing/matchers'; import {merge, NEVER, Observable, of, Subject, Subscription, timer} from 'rxjs'; import {map, tap} from 'rxjs/operators'; @@ -60,7 +66,6 @@ import { } from '../src/model/abstract_model'; import {MyInput, MyInputForm} from './value_accessor_integration_spec'; -import {timeout, useAutoTick} from './util'; // Produces a new @Directive (with a given selector) that represents a validator class. function createValidatorClass(selector: string) { diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts index 49cf3be1cd0..99a61e70e51 100644 --- a/packages/forms/test/template_integration_spec.ts +++ b/packages/forms/test/template_integration_spec.ts @@ -26,11 +26,10 @@ import { Validator, } from '../index'; import {By} from '@angular/platform-browser'; -import {dispatchEvent, sortedClassList} from '@angular/private/testing'; +import {dispatchEvent, useAutoTick, timeout, sortedClassList} from '@angular/private/testing'; import {merge} from 'rxjs'; import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integration_spec'; -import {timeout, useAutoTick} from './util'; describe('template-driven forms integration tests', () => { useAutoTick(); diff --git a/packages/forms/test/util.ts b/packages/forms/test/util.ts index c876a7827a1..16ae7258f3b 100644 --- a/packages/forms/test/util.ts +++ b/packages/forms/test/util.ts @@ -91,19 +91,3 @@ export function asyncValidatorReturningObservable(c: AbstractControl): EventEmit }); return e; } - -export async function timeout(ms?: number): Promise { - return new Promise((resolve) => { - setTimeout(resolve, ms); - }); -} - -export function useAutoTick() { - beforeEach(() => { - jasmine.clock().install(); - jasmine.clock().autoTick(); - }); - afterEach(() => { - jasmine.clock().uninstall(); - }); -} diff --git a/packages/forms/test/validators_spec.ts b/packages/forms/test/validators_spec.ts index 54295d1c788..e35b1c8973a 100644 --- a/packages/forms/test/validators_spec.ts +++ b/packages/forms/test/validators_spec.ts @@ -20,7 +20,7 @@ import { } from '../index'; import {normalizeValidators} from '../src/validators'; -import {timeout, useAutoTick} from './util'; +import {useAutoTick, timeout} from '@angular/private/testing'; (function () { function validator(key: string, error: any): ValidatorFn { diff --git a/packages/forms/test/value_accessor_integration_spec.ts b/packages/forms/test/value_accessor_integration_spec.ts index 4e8d763390e..c6e724c049e 100644 --- a/packages/forms/test/value_accessor_integration_spec.ts +++ b/packages/forms/test/value_accessor_integration_spec.ts @@ -39,9 +39,8 @@ import { Validators, } from '../index'; import {By, ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser'; -import {dispatchEvent, isNode} from '@angular/private/testing'; +import {dispatchEvent, useAutoTick, timeout, isNode} from '@angular/private/testing'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; -import {timeout, useAutoTick} from './util'; describe('value accessors', () => { useAutoTick();