cargdev/angular
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bootstrap): change bootstrap not to create a separate injector for the provided bindings

Browse Source 
Currently, we create a separate injector for the passed-in / root bindings. This injectors sits below the one creating the application component. This means that the applicaiton component cannot access the passed-in bindings.
This commit is contained in:
vsavkin
2015-01-08 09:11:33 -08:00
parent fbcc59dc67
commit 2074cc1ca9
3 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
modules/core/test/application_spec.js
View File

@ -1,11 +1,11 @@
import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach} from 'test_lib/test_lib';
import {bootstrap, appDocumentToken, appElementToken, documentDependentBindings}
import {bootstrap, appDocumentToken, appElementToken}
from 'core/application';
import {Component} from 'core/annotations/annotations';
import {DOM} from 'facade/dom';
import {ListWrapper} from 'facade/collection';
import {PromiseWrapper} from 'facade/async';
import {bind} from 'di/di';
import {bind, Inject} from 'di/di';
import {TemplateConfig} from 'core/annotations/template_config';
@Component({
@ -36,8 +36,23 @@ class HelloRootCmp2 {
}
}
@Component({
selector: 'hello-app',
template: new TemplateConfig({
inline: '',
directives: []
})
})
class HelloRootCmp3 {
appBinding;
constructor(@Inject("appBinding") appBinding) {
this.appBinding = appBinding;
}
}
export function main() {
var fakeDoc, el, el2;
var fakeDoc, el, el2, testBindings;
beforeEach(() => {
fakeDoc = DOM.createHtmlDocument();
@ -45,13 +60,9 @@ export function main() {
el2 = DOM.createElement('hello-app-2', fakeDoc);
DOM.appendChild(fakeDoc.body, el);
DOM.appendChild(fakeDoc.body, el2);
testBindings = [bind(appDocumentToken).toValue(fakeDoc)];
});
function testBindings(appComponentType) {
return ListWrapper.concat([bind(appDocumentToken).toValue(fakeDoc),
], documentDependentBindings(appComponentType));
}
describe('bootstrap factory method', () => {
it('should throw if no element is found', (done) => {
var injectorPromise = bootstrap(HelloRootCmp, [], (e,t) => {throw e;});
@ -63,12 +74,12 @@ export function main() {
});
it('should create an injector promise', () => {
var injectorPromise = bootstrap(HelloRootCmp, testBindings(HelloRootCmp));
var injectorPromise = bootstrap(HelloRootCmp, testBindings);
expect(injectorPromise).not.toBe(null);
});
it('should resolve an injector promise and contain bindings', (done) => {
var injectorPromise = bootstrap(HelloRootCmp, testBindings(HelloRootCmp));
var injectorPromise = bootstrap(HelloRootCmp, testBindings);
injectorPromise.then((injector) => {
expect(injector.get(appElementToken)).toBe(el);
done();
@ -76,7 +87,7 @@ export function main() {
});
it('should provide the application component in the injector', (done) => {
var injectorPromise = bootstrap(HelloRootCmp, testBindings(HelloRootCmp));
var injectorPromise = bootstrap(HelloRootCmp, testBindings);
injectorPromise.then((injector) => {
expect(injector.get(HelloRootCmp)).toBeAnInstanceOf(HelloRootCmp);
done();
@ -84,7 +95,7 @@ export function main() {
});
it('should display hello world', (done) => {
var injectorPromise = bootstrap(HelloRootCmp, testBindings(HelloRootCmp));
var injectorPromise = bootstrap(HelloRootCmp, testBindings);
injectorPromise.then((injector) => {
expect(injector.get(appElementToken)
.shadowRoot.childNodes[0].nodeValue).toEqual('hello world!');
@ -93,8 +104,8 @@ export function main() {
});
it('should support multiple calls to bootstrap', (done) => {
var injectorPromise1 = bootstrap(HelloRootCmp, testBindings(HelloRootCmp));
var injectorPromise2 = bootstrap(HelloRootCmp2, testBindings(HelloRootCmp2));
var injectorPromise1 = bootstrap(HelloRootCmp, testBindings);
var injectorPromise2 = bootstrap(HelloRootCmp2, testBindings);
PromiseWrapper.all([injectorPromise1, injectorPromise2]).then((injectors) => {
expect(injectors[0].get(appElementToken)
.shadowRoot.childNodes[0].nodeValue).toEqual('hello world!');
@ -103,5 +114,17 @@ export function main() {
done();
});
});
it("should make the provided binings available to the application component", (done) => {
var injectorPromise = bootstrap(HelloRootCmp3, [
testBindings,
bind("appBinding").toValue("BoundValue")
]);
injectorPromise.then((injector) => {
expect(injector.get(HelloRootCmp3).appBinding).toEqual("BoundValue");
done();
});
});
});
}