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

fix(change_detection): do not coalesce records with different directive indices

Browse Source
This commit is contained in:
vsavkin
2015-07-06 11:50:40 -07:00
parent 8681f79182
commit d2774421e8
2 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/angular2/test/change_detection/coalesce_spec.ts
View File

@ -1,13 +1,21 @@
import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
import {isBlank} from 'angular2/src/facade/lang';
import {coalesce} from 'angular2/src/change_detection/coalesce';
import {RecordType, ProtoRecord} from 'angular2/src/change_detection/proto_record';
import {DirectiveIndex} from 'angular2/src/change_detection/directive_record';
export function main() {
function r(funcOrValue, args, contextIndex, selfIndex, lastInBinding = false,
mode = RecordType.PROPERTY, name = "name") {
return new ProtoRecord(mode, name, funcOrValue, args, null, contextIndex, null, selfIndex, null,
null, lastInBinding, false);
function r(
funcOrValue, args, contextIndex, selfIndex,
{lastInBinding, mode, name,
directiveIndex}: {lastInBinding?: any, mode?: any, name?: any, directiveIndex?: any} = {}) {
if (isBlank(lastInBinding)) lastInBinding = false;
if (isBlank(mode)) mode = RecordType.PROPERTY;
if (isBlank(name)) name = "name";
if (isBlank(directiveIndex)) directiveIndex = null;
return new ProtoRecord(mode, name, funcOrValue, args, null, contextIndex, directiveIndex,
selfIndex, null, null, lastInBinding, false);
}
describe("change detection - coalesce", () => {
@ -44,9 +52,9 @@ export function main() {
[r("user1", [], 0, 1), r("user2", [], 0, 2), r("hi", [1], 0, 3), r("hi", [2], 0, 4)]);
});
it("should replace duplicate terminal records with" + " self records", () => {
var rs = coalesce([r("user", [], 0, 1, true), r("user", [], 0, 2, true)]);
it("should replace duplicate terminal records with self records", () => {
var rs = coalesce(
[r("user", [], 0, 1, {lastInBinding: true}), r("user", [], 0, 2, {lastInBinding: true})]);
expect(rs[1]).toEqual(new ProtoRecord(RecordType.SELF, "self", null, [], null, 1, null, 2,
null, null, true, false));
@ -54,8 +62,8 @@ export function main() {
it("should not coalesce directive lifecycle records", () => {
var rs = coalesce([
r("onCheck", [], 0, 1, true, RecordType.DIRECTIVE_LIFECYCLE),
r("onCheck", [], 0, 1, true, RecordType.DIRECTIVE_LIFECYCLE)
r("onCheck", [], 0, 1, {mode: RecordType.DIRECTIVE_LIFECYCLE}),
r("onCheck", [], 0, 1, {mode: RecordType.DIRECTIVE_LIFECYCLE})
]);
expect(rs.length).toEqual(2);
@ -64,10 +72,22 @@ export function main() {
it("should not coalesce protos with different names but same value", () => {
var nullFunc = () => {};
var rs = coalesce([
r(nullFunc, [], 0, 1, false, RecordType.PROPERTY, "foo"),
r(nullFunc, [], 0, 1, false, RecordType.PROPERTY, "bar"),
r(nullFunc, [], 0, 1, {name: "foo"}),
r(nullFunc, [], 0, 1, {name: "bar"}),
]);
expect(rs.length).toEqual(2);
});
it("should not coalesce protos with the same context index but different directive indices",
() => {
var nullFunc = () => {};
var rs = coalesce([
r(nullFunc, [], 0, 1, {directiveIndex: new DirectiveIndex(0, 0)}),
r(nullFunc, [], 0, 1, {directiveIndex: new DirectiveIndex(0, 1)}),
r(nullFunc, [], 0, 1, {directiveIndex: new DirectiveIndex(1, 0)}),
r(nullFunc, [], 0, 1, {directiveIndex: null}),
]);
expect(rs.length).toEqual(4);
});
});
}