From 213c25fb087939cb668bd47ca34ec7a616d3e371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= Date: Fri, 19 Oct 2018 16:43:31 -0700 Subject: [PATCH] build: remove manual tags from platform jasmine tests (#26606) PR Close #26606 --- packages/platform-browser-dynamic/test/BUILD.bazel | 2 -- .../resource_loader/resource_loader_cache_spec.ts | 2 +- .../test/resource_loader/resource_loader_impl_spec.ts | 2 +- .../test/testing_public_browser_spec.ts | 2 +- packages/platform-browser/test/BUILD.bazel | 1 - packages/platform-browser/test/testing_public_spec.ts | 11 ++++++----- tools/testing/init_node_spec.ts | 3 +++ 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel index 53273f1b7e..487a48fc44 100644 --- a/packages/platform-browser-dynamic/test/BUILD.bazel +++ b/packages/platform-browser-dynamic/test/BUILD.bazel @@ -18,8 +18,6 @@ ts_library( jasmine_node_test( name = "test", bootstrap = ["angular/tools/testing/init_node_spec.js"], - # dissable since tests are running but not yet passing - tags = ["manual"], deps = [ ":test_lib", "//tools/testing:node", diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts index 4f109fbbe1..1c6ecb17e6 100644 --- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts +++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts @@ -15,7 +15,7 @@ import {CachedResourceLoader} from '../../src/resource_loader/resource_loader_ca import {setTemplateCache} from './resource_loader_cache_setter'; -{ +if (isBrowser) { describe('CachedResourceLoader', () => { let resourceLoader: CachedResourceLoader; diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts index b10eb07eae..102bbf676d 100644 --- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts +++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts @@ -9,7 +9,7 @@ import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {ResourceLoaderImpl} from '../../src/resource_loader/resource_loader_impl'; -{ +if (isBrowser) { describe('ResourceLoaderImpl', () => { let resourceLoader: ResourceLoaderImpl; diff --git a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts index 70d733e1bb..5b08d56cce 100644 --- a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts +++ b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts @@ -37,7 +37,7 @@ class BadTemplateUrl { // Tests for angular/testing bundle specific to the browser environment. // For general tests, see test/testing/testing_public_spec.ts. -{ +if (isBrowser) { describe('test APIs for the browser', () => { describe('using the async helper', () => { let actuallyDone: boolean; diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 051d453b8c..bd170e900e 100644 --- a/packages/platform-browser/test/BUILD.bazel +++ b/packages/platform-browser/test/BUILD.bazel @@ -30,7 +30,6 @@ jasmine_node_test( name = "test", bootstrap = ["angular/tools/testing/init_node_spec.js"], # dissable since tests are running but not yet passing - tags = ["manual"], deps = [ ":test_lib", "//tools/testing:node", diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts index d2f4031904..d84a8a0530 100644 --- a/packages/platform-browser/test/testing_public_spec.ts +++ b/packages/platform-browser/test/testing_public_spec.ts @@ -307,11 +307,12 @@ class CompWithUrlTemplate { TestBed.compileComponents(); })); - it('should allow to createSync components with templateUrl after explicit async compilation', - () => { - const fixture = TestBed.createComponent(CompWithUrlTemplate); - expect(fixture.nativeElement).toHaveText('from external template'); - }); + isBrowser && + it('should allow to createSync components with templateUrl after explicit async compilation', + () => { + const fixture = TestBed.createComponent(CompWithUrlTemplate); + expect(fixture.nativeElement).toHaveText('from external template'); + }); }); describe('overwriting metadata', () => { diff --git a/tools/testing/init_node_spec.ts b/tools/testing/init_node_spec.ts index 78b3600e6d..4af10e28e9 100644 --- a/tools/testing/init_node_spec.ts +++ b/tools/testing/init_node_spec.ts @@ -40,6 +40,9 @@ import 'zone.js/dist/jasmine-patch.js'; import {TestBed} from '@angular/core/testing'; import {ServerTestingModule, platformServerTesting} from '@angular/platform-server/testing/src/server'; import {DominoAdapter} from '@angular/platform-server/src/domino_adapter'; +import {createDocument} from 'domino'; TestBed.initTestEnvironment(ServerTestingModule, platformServerTesting()); DominoAdapter.makeCurrent(); +(global as any).document = + (DominoAdapter as any).defaultDoc || ((DominoAdapter as any).defaultDoc = createDocument());