diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index 22f7ae65b3..896449cfff 100644 --- a/packages/common/http/test/BUILD.bazel +++ b/packages/common/http/test/BUILD.bazel @@ -19,9 +19,6 @@ ts_library( jasmine_node_test( name = "test", bootstrap = ["angular/tools/testing/init_node_spec.js"], - tags = [ - "fixme-ivy-aot", - ], deps = [ ":test_lib", "//tools/testing:node", @@ -30,9 +27,6 @@ jasmine_node_test( ts_web_test_suite( name = "test_web", - tags = [ - "fixme-ivy-aot", - ], deps = [ ":test_lib", ], diff --git a/packages/common/http/test/client_spec.ts b/packages/common/http/test/client_spec.ts index 9c9942af7b..bed29df8eb 100644 --- a/packages/common/http/test/client_spec.ts +++ b/packages/common/http/test/client_spec.ts @@ -6,13 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ +import {HttpClient} from '@angular/common/http/src/client'; +import {HttpErrorResponse, HttpEventType, HttpResponse} from '@angular/common/http/src/response'; +import {HttpClientTestingBackend} from '@angular/common/http/testing/src/backend'; import {ddescribe, describe, fit, it} from '@angular/core/testing/src/testing_internal'; import {toArray} from 'rxjs/operators'; -import {HttpClient} from '../src/client'; -import {HttpErrorResponse, HttpEventType, HttpResponse} from '../src/response'; -import {HttpClientTestingBackend} from '../testing/src/backend'; - { describe('HttpClient', () => { let client: HttpClient = null !; diff --git a/packages/common/http/test/headers_spec.ts b/packages/common/http/test/headers_spec.ts index e26b07f4d7..c7e23e2b2c 100644 --- a/packages/common/http/test/headers_spec.ts +++ b/packages/common/http/test/headers_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {HttpHeaders} from '../src/headers'; +import {HttpHeaders} from '@angular/common/http/src/headers'; { describe('HttpHeaders', () => { diff --git a/packages/common/http/test/jsonp_spec.ts b/packages/common/http/test/jsonp_spec.ts index 2d0fef287d..0686271fb2 100644 --- a/packages/common/http/test/jsonp_spec.ts +++ b/packages/common/http/test/jsonp_spec.ts @@ -6,13 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ +import {JSONP_ERR_NO_CALLBACK, JSONP_ERR_WRONG_METHOD, JSONP_ERR_WRONG_RESPONSE_TYPE, JsonpClientBackend} from '@angular/common/http/src/jsonp'; +import {HttpRequest} from '@angular/common/http/src/request'; +import {HttpErrorResponse, HttpEventType} from '@angular/common/http/src/response'; import {ddescribe, describe, it} from '@angular/core/testing/src/testing_internal'; import {toArray} from 'rxjs/operators'; -import {JSONP_ERR_NO_CALLBACK, JSONP_ERR_WRONG_METHOD, JSONP_ERR_WRONG_RESPONSE_TYPE, JsonpClientBackend} from '../src/jsonp'; -import {HttpRequest} from '../src/request'; -import {HttpErrorResponse, HttpEventType} from '../src/response'; - import {MockDocument} from './jsonp_mock'; function runOnlyCallback(home: any, data: Object) { diff --git a/packages/common/http/test/module_spec.ts b/packages/common/http/test/module_spec.ts index 33dd1a47ed..1b0af18597 100644 --- a/packages/common/http/test/module_spec.ts +++ b/packages/common/http/test/module_spec.ts @@ -6,20 +6,19 @@ * found in the LICENSE file at https://angular.io/license */ +import {HttpHandler} from '@angular/common/http/src/backend'; +import {HttpClient} from '@angular/common/http/src/client'; +import {HTTP_INTERCEPTORS, HttpInterceptor} from '@angular/common/http/src/interceptor'; +import {HttpRequest} from '@angular/common/http/src/request'; +import {HttpEvent, HttpResponse} from '@angular/common/http/src/response'; +import {HttpTestingController} from '@angular/common/http/testing/src/api'; +import {HttpClientTestingModule} from '@angular/common/http/testing/src/module'; +import {TestRequest} from '@angular/common/http/testing/src/request'; import {Injectable, Injector} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; -import {HttpHandler} from '../src/backend'; -import {HttpClient} from '../src/client'; -import {HTTP_INTERCEPTORS, HttpInterceptor} from '../src/interceptor'; -import {HttpRequest} from '../src/request'; -import {HttpEvent, HttpResponse} from '../src/response'; -import {HttpTestingController} from '../testing/src/api'; -import {HttpClientTestingModule} from '../testing/src/module'; -import {TestRequest} from '../testing/src/request'; - class TestInterceptor implements HttpInterceptor { constructor(private value: string) {} diff --git a/packages/common/http/test/params_spec.ts b/packages/common/http/test/params_spec.ts index 304ebb1ec2..0e798129bd 100644 --- a/packages/common/http/test/params_spec.ts +++ b/packages/common/http/test/params_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {HttpParams} from '../src/params'; +import {HttpParams} from '@angular/common/http/src/params'; { describe('HttpUrlEncodedParams', () => { diff --git a/packages/common/http/test/request_spec.ts b/packages/common/http/test/request_spec.ts index d5ed4549ad..af17f0f788 100644 --- a/packages/common/http/test/request_spec.ts +++ b/packages/common/http/test/request_spec.ts @@ -6,12 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ +import {HttpHeaders} from '@angular/common/http/src/headers'; +import {HttpParams} from '@angular/common/http/src/params'; +import {HttpRequest} from '@angular/common/http/src/request'; import {ddescribe, describe, it} from '@angular/core/testing/src/testing_internal'; -import {HttpHeaders} from '../src/headers'; -import {HttpParams} from '../src/params'; -import {HttpRequest} from '../src/request'; - const TEST_URL = 'http://angular.io'; const TEST_STRING = `I'm a body!`; @@ -161,4 +160,4 @@ const TEST_STRING = `I'm a body!`; }); }); }); -} \ No newline at end of file +} diff --git a/packages/common/http/test/response_spec.ts b/packages/common/http/test/response_spec.ts index c2e116a08e..45b9943f0b 100644 --- a/packages/common/http/test/response_spec.ts +++ b/packages/common/http/test/response_spec.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {HttpHeaders} from '@angular/common/http/src/headers'; +import {HttpResponse} from '@angular/common/http/src/response'; import {ddescribe, describe, it} from '@angular/core/testing/src/testing_internal'; -import {HttpHeaders} from '../src/headers'; -import {HttpResponse} from '../src/response'; - { describe('HttpResponse', () => { describe('constructor()', () => { @@ -79,4 +78,4 @@ import {HttpResponse} from '../src/response'; }); }); }); -} \ No newline at end of file +} diff --git a/packages/common/http/test/xhr_mock.ts b/packages/common/http/test/xhr_mock.ts index 419d4af7e7..bfac036991 100644 --- a/packages/common/http/test/xhr_mock.ts +++ b/packages/common/http/test/xhr_mock.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {HttpHeaders} from '../src/headers'; -import {XhrFactory} from '../src/xhr'; +import {HttpHeaders} from '@angular/common/http/src/headers'; +import {XhrFactory} from '@angular/common/http/src/xhr'; export class MockXhrFactory implements XhrFactory { // TODO(issue/24571): remove '!'. @@ -119,4 +119,4 @@ export class MockXMLHttpRequest { } abort() { this.mockAborted = true; } -} \ No newline at end of file +} diff --git a/packages/common/http/test/xhr_spec.ts b/packages/common/http/test/xhr_spec.ts index 4218532c88..dfafef1df3 100644 --- a/packages/common/http/test/xhr_spec.ts +++ b/packages/common/http/test/xhr_spec.ts @@ -6,14 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ +import {HttpRequest} from '@angular/common/http/src/request'; +import {HttpDownloadProgressEvent, HttpErrorResponse, HttpEvent, HttpEventType, HttpHeaderResponse, HttpResponse, HttpResponseBase, HttpUploadProgressEvent} from '@angular/common/http/src/response'; +import {HttpXhrBackend} from '@angular/common/http/src/xhr'; import {ddescribe, describe, fit, it} from '@angular/core/testing/src/testing_internal'; import {Observable} from 'rxjs'; import {toArray} from 'rxjs/operators'; -import {HttpRequest} from '../src/request'; -import {HttpDownloadProgressEvent, HttpErrorResponse, HttpEvent, HttpEventType, HttpHeaderResponse, HttpResponse, HttpResponseBase, HttpUploadProgressEvent} from '../src/response'; -import {HttpXhrBackend} from '../src/xhr'; - import {MockXhrFactory} from './xhr_mock'; function trackEvents(obs: Observable>): HttpEvent[] { diff --git a/packages/common/http/test/xsrf_spec.ts b/packages/common/http/test/xsrf_spec.ts index 02a1569b07..252b0032b6 100644 --- a/packages/common/http/test/xsrf_spec.ts +++ b/packages/common/http/test/xsrf_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {HttpHeaders} from '../src/headers'; -import {HttpRequest} from '../src/request'; -import {HttpXsrfCookieExtractor, HttpXsrfInterceptor, HttpXsrfTokenExtractor} from '../src/xsrf'; +import {HttpHeaders} from '@angular/common/http/src/headers'; +import {HttpRequest} from '@angular/common/http/src/request'; +import {HttpXsrfCookieExtractor, HttpXsrfInterceptor, HttpXsrfTokenExtractor} from '@angular/common/http/src/xsrf'; -import {HttpClientTestingBackend} from '../testing/src/backend'; +import {HttpClientTestingBackend} from '@angular/common/http/testing/src/backend'; class SampleTokenExtractor extends HttpXsrfTokenExtractor { constructor(private token: string|null) { super(); } @@ -88,4 +88,4 @@ class SampleTokenExtractor extends HttpXsrfTokenExtractor { function getParseCount(extractor: HttpXsrfCookieExtractor): number { return (extractor as any).parseCount; -} \ No newline at end of file +} diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index 00726043e4..a16c2669ef 100644 --- a/packages/http/test/BUILD.bazel +++ b/packages/http/test/BUILD.bazel @@ -18,7 +18,6 @@ ts_library( jasmine_node_test( name = "test", bootstrap = ["angular/tools/testing/init_node_spec.js"], - tags = ["fixme-ivy-aot"], deps = [ ":test_lib", "//tools/testing:node", @@ -27,7 +26,6 @@ jasmine_node_test( ts_web_test_suite( name = "test_web", - tags = ["fixme-ivy-aot"], deps = [ ":test_lib", "@ngdeps//karma", diff --git a/packages/http/test/http_spec.ts b/packages/http/test/http_spec.ts index 669de8b0f5..24f95fb531 100644 --- a/packages/http/test/http_spec.ts +++ b/packages/http/test/http_spec.ts @@ -10,11 +10,11 @@ import {Injector} from '@angular/core'; import {TestBed, getTestBed} from '@angular/core/testing'; import {AsyncTestCompleter, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {stringToArrayBuffer} from '@angular/http/src/http_utils'; +import {MockBackend, MockConnection} from '@angular/http/testing/src/mock_backend'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {Observable, zip} from 'rxjs'; import {BaseRequestOptions, ConnectionBackend, Http, HttpModule, JSONPBackend, Jsonp, JsonpModule, Request, RequestMethod, RequestOptions, Response, ResponseContentType, ResponseOptions, URLSearchParams, XHRBackend} from '../index'; -import {MockBackend, MockConnection} from '../testing/src/mock_backend'; { describe('injectables', () => {