fix(ShadowDomStrategy): always inline import rules

fixes #1694

modules/angular2/test/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy_spec.ts

@@ -23,18 +23,26 @@ import {
 } from 'angular2/src/render/dom/shadow_dom/util';
 import {UrlResolver} from 'angular2/src/services/url_resolver';
 import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver';
+import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner';
+
+import {isBlank} from 'angular2/src/facade/lang';
+import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+
+import {XHR} from 'angular2/src/render/xhr';
 
 export function main() {
   var strategy;
 
   describe('EmulatedUnscopedShadowDomStrategy', () => {
-    var styleHost;
+    var xhr, styleHost;
 
     beforeEach(() => {
       var urlResolver = new UrlResolver();
       var styleUrlResolver = new StyleUrlResolver(urlResolver);
+      xhr = new FakeXHR();
+      var styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
       styleHost = el('<div></div>');
-      strategy = new EmulatedUnscopedShadowDomStrategy(styleUrlResolver, styleHost);
+      strategy = new EmulatedUnscopedShadowDomStrategy(styleInliner, styleUrlResolver, styleHost);
       resetShadowDomCache();
     });
 
@@ -49,11 +57,20 @@ export function main() {
       expect(styleElement).toHaveText(".foo {background-image: url('http://base/img.jpg');}");
     });
 
-    it('should not inline import rules', () => {
-      var styleElement = el('<style>@import "other.css";</style>');
-      strategy.processStyleElement('someComponent', 'http://base', styleElement);
-      expect(styleElement).toHaveText("@import 'http://base/other.css';");
-    });
+    it('should inline @import rules', inject([AsyncTestCompleter], (async) => {
+         xhr.reply('http://base/one.css', '.one {}');
+
+         var styleElement = el('<style>@import "one.css";</style>');
+         var stylePromise =
+             strategy.processStyleElement('someComponent', 'http://base', styleElement);
+         expect(stylePromise).toBePromise();
+         expect(styleElement).toHaveText('');
+
+         stylePromise.then((_) => {
+           expect(styleElement).toHaveText('.one {}\n');
+           async.done();
+         });
+       }));
 
     it('should move the style element to the style host', () => {
       var compileElement = el('<div><style>.one {}</style></div>');
@@ -79,3 +96,23 @@ export function main() {
 
   });
 }
+
+class FakeXHR extends XHR {
+  _responses: Map<string, string>;
+
+  constructor() {
+    super();
+    this._responses = MapWrapper.create();
+  }
+
+  get(url: string): Promise<string> {
+    var response = MapWrapper.get(this._responses, url);
+    if (isBlank(response)) {
+      return PromiseWrapper.reject('xhr error', null);
+    }
+
+    return PromiseWrapper.resolve(response);
+  }
+
+  reply(url: string, response: string) { MapWrapper.set(this._responses, url, response); }
+}

modules/angular2/test/render/dom/shadow_dom/native_shadow_dom_strategy_spec.ts

@@ -17,6 +17,13 @@ import {
 } from 'angular2/src/render/dom/shadow_dom/native_shadow_dom_strategy';
 import {UrlResolver} from 'angular2/src/services/url_resolver';
 import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver';
+import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner';
+
+import {XHR} from 'angular2/src/render/xhr';
+
+import {isBlank} from 'angular2/src/facade/lang';
+import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {Map, MapWrapper} from 'angular2/src/facade/collection';
 
 import {DOM} from 'angular2/src/dom/dom_adapter';
 
@@ -24,10 +31,13 @@ export function main() {
   var strategy;
 
   describe('NativeShadowDomStrategy', () => {
+    var xhr;
     beforeEach(() => {
       var urlResolver = new UrlResolver();
       var styleUrlResolver = new StyleUrlResolver(urlResolver);
-      strategy = new NativeShadowDomStrategy(styleUrlResolver);
+      xhr = new FakeXHR();
+      var styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
+      strategy = new NativeShadowDomStrategy(styleInliner, styleUrlResolver);
     });
 
     if (DOM.supportsNativeShadowDOM()) {
@@ -44,10 +54,39 @@ export function main() {
           .toHaveText(".foo {" + "background-image: url('http://base/img.jpg');" + "}");
     });
 
-    it('should not inline import rules', () => {
-      var styleElement = el('<style>@import "other.css";</style>');
-      strategy.processStyleElement('someComponent', 'http://base', styleElement);
-      expect(styleElement).toHaveText("@import 'http://base/other.css';");
-    });
+    it('should inline @import rules', inject([AsyncTestCompleter], (async) => {
+         xhr.reply('http://base/one.css', '.one {}');
+
+         var styleElement = el('<style>@import "one.css";</style>');
+         var stylePromise =
+             strategy.processStyleElement('someComponent', 'http://base', styleElement);
+         expect(stylePromise).toBePromise();
+
+         stylePromise.then((_) => {
+           expect(styleElement).toHaveText('.one {}\n');
+           async.done();
+         });
+       }));
+
   });
 }
+
+class FakeXHR extends XHR {
+  _responses: Map<string, string>;
+
+  constructor() {
+    super();
+    this._responses = MapWrapper.create();
+  }
+
+  get(url: string): Promise<string> {
+    var response = MapWrapper.get(this._responses, url);
+    if (isBlank(response)) {
+      return PromiseWrapper.reject('xhr error', null);
+    }
+
+    return PromiseWrapper.resolve(response);
+  }
+
+  reply(url: string, response: string) { MapWrapper.set(this._responses, url, response); }
+}

modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.ts

@@ -43,17 +43,17 @@ export function main() {
               .toFactory((styleInliner, styleUrlResolver) => new EmulatedScopedShadowDomStrategy(
                              styleInliner, styleUrlResolver, styleHost),
                          [StyleInliner, StyleUrlResolver]),
-      "unscoped": bind(ShadowDomStrategy)
-                      .toFactory((styleUrlResolver) => new EmulatedUnscopedShadowDomStrategy(
-                                     styleUrlResolver, styleHost),
-                                 [StyleUrlResolver])
+      "unscoped": bind(ShadowDomStrategy).toFactory(
+          (styleInliner, styleUrlResolver) => new EmulatedUnscopedShadowDomStrategy(
+              styleInliner, styleUrlResolver, null), [StyleInliner, StyleUrlResolver])
     };
     if (DOM.supportsNativeShadowDOM()) {
       StringMapWrapper.set(
           strategies, "native",
           bind(ShadowDomStrategy)
-              .toFactory((styleUrlResolver) => new NativeShadowDomStrategy(styleUrlResolver),
-                         [StyleUrlResolver]));
+              .toFactory((styleInliner, styleUrlResolver) =>
+                             new NativeShadowDomStrategy(styleInliner, styleUrlResolver),
+                         [StyleInliner, StyleUrlResolver]));
     }
     beforeEach(() => { styleHost = el('<div></div>'); });