diff --git a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts index 11ce131d32..436b480d59 100644 --- a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts +++ b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts @@ -10,6 +10,8 @@ import { xit } from '@angular/core/testing/testing_internal'; +import {browserDetection} from '@angular/platform-browser/testing'; + import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry'; import {SecurityContext} from '../../core_private'; import {extractSchema} from './schema_extractor'; @@ -69,14 +71,17 @@ export function main() { it('should detect properties on namespaced elements', () => { expect(registry.hasProperty('@svg:g', 'id')).toBeTruthy(); }); - it('generate a new schema', () => { - // console.log(JSON.stringify(registry.properties)); - extractSchema( + if (browserDetection.isChromeDesktop) { + it('generate a new schema', () => { + // console.log(JSON.stringify(registry.properties)); + extractSchema( (descriptors) => { - // Uncomment this line to see: - // the generated schema which can then be pasted to the DomElementSchemaRegistry - // console.log(descriptors); + // Uncomment this line to see: + // the generated schema which can then be pasted to the DomElementSchemaRegistry + // console.log(descriptors); }); - }); + }); + } + }); } diff --git a/modules/@angular/platform-browser/test/browser_util_spec.ts b/modules/@angular/platform-browser/test/browser_util_spec.ts index f830c51973..78bd8fc964 100644 --- a/modules/@angular/platform-browser/test/browser_util_spec.ts +++ b/modules/@angular/platform-browser/test/browser_util_spec.ts @@ -16,7 +16,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: false, - supportsIntlApi: true + supportsIntlApi: true, + isChromeDesktop: true }, { name: 'Chrome mobile', @@ -28,7 +29,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: false, - supportsIntlApi: true + supportsIntlApi: true, + isChromeDesktop: false }, { name: 'Firefox', @@ -40,7 +42,8 @@ export function main() { isWebkit: false, isIOS7: false, isSlow: false, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'IE9', @@ -52,7 +55,8 @@ export function main() { isWebkit: false, isIOS7: false, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'IE10', @@ -64,7 +68,8 @@ export function main() { isWebkit: false, isIOS7: false, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'IE11', @@ -76,7 +81,8 @@ export function main() { isWebkit: false, isIOS7: false, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Edge', @@ -88,7 +94,8 @@ export function main() { isWebkit: false, isIOS7: false, isSlow: false, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Android4.1', @@ -100,7 +107,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Android4.2', @@ -112,7 +120,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Android4.3', @@ -124,7 +133,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Android4.4', @@ -136,7 +146,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: false, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Safari7', @@ -148,7 +159,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: false, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'Safari8', @@ -160,7 +172,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: false, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'iOS7', @@ -172,7 +185,8 @@ export function main() { isWebkit: true, isIOS7: true, isSlow: true, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false }, { name: 'iOS8', @@ -184,7 +198,8 @@ export function main() { isWebkit: true, isIOS7: false, isSlow: false, - supportsIntlApi: false + supportsIntlApi: false, + isChromeDesktop: false } ]; @@ -199,6 +214,7 @@ export function main() { expect(bd.isIOS7).toBe(StringMapWrapper.get(browser, 'isIOS7')); expect(bd.isSlow).toBe(StringMapWrapper.get(browser, 'isSlow')); expect(bd.supportsIntlApi).toBe(StringMapWrapper.get(browser, 'supportsIntlApi')); + expect(bd.isChromeDesktop).toBe(StringMapWrapper.get(browser, 'isChromeDesktop')); }); }); }); diff --git a/modules/@angular/platform-browser/testing/browser_util.ts b/modules/@angular/platform-browser/testing/browser_util.ts index 562b1892e7..f3d3954810 100644 --- a/modules/@angular/platform-browser/testing/browser_util.ts +++ b/modules/@angular/platform-browser/testing/browser_util.ts @@ -43,6 +43,10 @@ export class BrowserDetection { get supportsIntlApi(): boolean { return this._ua.indexOf('Chrome/4') > -1 && this._ua.indexOf('Edge') == -1; } + + get isChromeDesktop(): boolean { + return this._ua.indexOf('Chrome') > -1 && this._ua.indexOf('Mobile Safari') == -1 && this._ua.indexOf('Edge') == -1; + } } export function dispatchEvent(element, eventType): void {