diff --git a/modules/angular2/src/test_lib/utils.ts b/modules/angular2/src/test_lib/utils.ts index 50d2a1793e..281c818a52 100644 --- a/modules/angular2/src/test_lib/utils.ts +++ b/modules/angular2/src/test_lib/utils.ts @@ -88,7 +88,8 @@ export function normalizeCSS(css: string): string { css = StringWrapper.replaceAll(css, /:\s/g, ':'); css = StringWrapper.replaceAll(css, /'/g, '"'); css = StringWrapper.replaceAll(css, / }/g, '}'); - css = StringWrapper.replaceAllMapped(css, /url\(\"(.+)\\"\)/g, (match) => `url(${match[1]})`); + css = StringWrapper.replaceAllMapped(css, /url\((\"|\s)(.+)(\"|\s)\)(\s*)/g, + (match) => `url("${match[2]}")`); css = StringWrapper.replaceAllMapped(css, /\[(.+)=([^"\]]+)\]/g, (match) => `[${match[1]}="${match[2]}"]`); return css; diff --git a/modules/angular2/test/core/compiler/shadow_css_spec.ts b/modules/angular2/test/core/compiler/shadow_css_spec.ts index 1e9c334fd2..6159b71206 100644 --- a/modules/angular2/test/core/compiler/shadow_css_spec.ts +++ b/modules/angular2/test/core/compiler/shadow_css_spec.ts @@ -155,10 +155,14 @@ export function main() { expect(css).toEqual('x[a] y[a] {}'); }); - it('should pass through @import directives', () => { - var styleStr = '@import url("https://fonts.googleapis.com/css?family=Roboto");'; - var css = s(styleStr, 'a'); - expect(css).toEqual(styleStr); - }); + // TODO: can't work in Firefox, see https://bugzilla.mozilla.org/show_bug.cgi?id=625013 + // Issue opened to track that: https://github.com/angular/angular/issues/4628 + if (!browserDetection.isFirefox) { + it('should pass through @import directives', () => { + var styleStr = '@import url("https://fonts.googleapis.com/css?family=Roboto");'; + var css = s(styleStr, 'a'); + expect(css).toEqual(styleStr); + }); + } }); }