mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-23 01:40:25 +00:00
fix($parse): support methods on falsy primitive types
e.g. zero, false, empty string - fix tests to be executed with csp true - fix cps (when more than 5 parts)
This commit is contained in:
Vojta Jina
parent
8e2675029f
commit
499a76a08c
2 changed files with 431 additions and 413 deletions
|
|
@ -695,7 +695,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
|
|||
var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope,
|
||||
promise;
|
||||
|
||||
if (!pathVal) return pathVal;
|
||||
if (pathVal === null || pathVal === undefined) return pathVal;
|
||||
|
||||
pathVal = pathVal[key0];
|
||||
if (pathVal && pathVal.then) {
|
||||
|
|
@ -706,7 +706,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
|
|||
}
|
||||
pathVal = pathVal.$$v;
|
||||
}
|
||||
if (!key1 || !pathVal) return pathVal;
|
||||
if (!key1 || pathVal === null || pathVal === undefined) return pathVal;
|
||||
|
||||
pathVal = pathVal[key1];
|
||||
if (pathVal && pathVal.then) {
|
||||
|
|
@ -717,7 +717,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
|
|||
}
|
||||
pathVal = pathVal.$$v;
|
||||
}
|
||||
if (!key2 || !pathVal) return pathVal;
|
||||
if (!key2 || pathVal === null || pathVal === undefined) return pathVal;
|
||||
|
||||
pathVal = pathVal[key2];
|
||||
if (pathVal && pathVal.then) {
|
||||
|
|
@ -728,7 +728,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
|
|||
}
|
||||
pathVal = pathVal.$$v;
|
||||
}
|
||||
if (!key3 || !pathVal) return pathVal;
|
||||
if (!key3 || pathVal === null || pathVal === undefined) return pathVal;
|
||||
|
||||
pathVal = pathVal[key3];
|
||||
if (pathVal && pathVal.then) {
|
||||
|
|
@ -739,7 +739,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
|
|||
}
|
||||
pathVal = pathVal.$$v;
|
||||
}
|
||||
if (!key4 || !pathVal) return pathVal;
|
||||
if (!key4 || pathVal === null || pathVal === undefined) return pathVal;
|
||||
|
||||
pathVal = pathVal[key4];
|
||||
if (pathVal && pathVal.then) {
|
||||
|
|
@ -767,18 +767,21 @@ function getterFn(path, csp) {
|
|||
fn = (pathKeysLength < 6)
|
||||
? cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4])
|
||||
: function(scope, locals) {
|
||||
var i = 0, val;
|
||||
var i = 0, val
|
||||
do {
|
||||
val = cspSafeGetterFn(
|
||||
pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++]
|
||||
)(scope, locals);
|
||||
|
||||
locals = undefined; // clear after first iteration
|
||||
scope = val;
|
||||
} while (i < pathKeysLength);
|
||||
};
|
||||
return val;
|
||||
}
|
||||
} else {
|
||||
var code = 'var l, fn, p;\n';
|
||||
forEach(pathKeys, function(key, index) {
|
||||
code += 'if(!s) return s;\n' +
|
||||
code += 'if(s === null || s === undefined) return s;\n' +
|
||||
'l=s;\n' +
|
||||
's='+ (index
|
||||
// we simply dereference 's' on any .dot notation
|
||||
|
|
|
|||
|
|
@ -174,478 +174,493 @@ describe('parser', function() {
|
|||
|
||||
forEach([true, false], function(cspEnabled) {
|
||||
|
||||
beforeEach(inject(function ($rootScope, $sniffer) {
|
||||
scope = $rootScope;
|
||||
$sniffer.csp = cspEnabled;
|
||||
}));
|
||||
describe('csp ' + cspEnabled, function() {
|
||||
|
||||
|
||||
it('should parse expressions', function() {
|
||||
expect(scope.$eval("-1")).toEqual(-1);
|
||||
expect(scope.$eval("1 + 2.5")).toEqual(3.5);
|
||||
expect(scope.$eval("1 + -2.5")).toEqual(-1.5);
|
||||
expect(scope.$eval("1+2*3/4")).toEqual(1+2*3/4);
|
||||
expect(scope.$eval("0--1+1.5")).toEqual(0- -1 + 1.5);
|
||||
expect(scope.$eval("-0--1++2*-3/-4")).toEqual(-0- -1+ +2*-3/-4);
|
||||
expect(scope.$eval("1/2*3")).toEqual(1/2*3);
|
||||
});
|
||||
|
||||
it('should parse comparison', function() {
|
||||
expect(scope.$eval("false")).toBeFalsy();
|
||||
expect(scope.$eval("!true")).toBeFalsy();
|
||||
expect(scope.$eval("1==1")).toBeTruthy();
|
||||
expect(scope.$eval("1!=2")).toBeTruthy();
|
||||
expect(scope.$eval("1<2")).toBeTruthy();
|
||||
expect(scope.$eval("1<=1")).toBeTruthy();
|
||||
expect(scope.$eval("1>2")).toEqual(1>2);
|
||||
expect(scope.$eval("2>=1")).toEqual(2>=1);
|
||||
expect(scope.$eval("true==2<3")).toEqual(true === 2<3);
|
||||
});
|
||||
|
||||
it('should parse logical', function() {
|
||||
expect(scope.$eval("0&&2")).toEqual(0&&2);
|
||||
expect(scope.$eval("0||2")).toEqual(0||2);
|
||||
expect(scope.$eval("0||1&&2")).toEqual(0||1&&2);
|
||||
});
|
||||
|
||||
it('should parse string', function() {
|
||||
expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
|
||||
});
|
||||
|
||||
it('should parse filters', function() {
|
||||
$filterProvider.register('substring', valueFn(function(input, start, end) {
|
||||
return input.substring(start, end);
|
||||
beforeEach(inject(function ($rootScope, $sniffer) {
|
||||
scope = $rootScope;
|
||||
$sniffer.csp = cspEnabled;
|
||||
getterFnCache = {}; // clear cache
|
||||
}));
|
||||
|
||||
expect(function() {
|
||||
scope.$eval("1|nonexistent");
|
||||
}).toThrow(new Error("Unknown provider: nonexistentFilterProvider <- nonexistentFilter"));
|
||||
|
||||
scope.offset = 3;
|
||||
expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
|
||||
expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
|
||||
});
|
||||
it('should parse expressions', function() {
|
||||
expect(scope.$eval("-1")).toEqual(-1);
|
||||
expect(scope.$eval("1 + 2.5")).toEqual(3.5);
|
||||
expect(scope.$eval("1 + -2.5")).toEqual(-1.5);
|
||||
expect(scope.$eval("1+2*3/4")).toEqual(1+2*3/4);
|
||||
expect(scope.$eval("0--1+1.5")).toEqual(0- -1 + 1.5);
|
||||
expect(scope.$eval("-0--1++2*-3/-4")).toEqual(-0- -1+ +2*-3/-4);
|
||||
expect(scope.$eval("1/2*3")).toEqual(1/2*3);
|
||||
});
|
||||
|
||||
it('should access scope', function() {
|
||||
scope.a = 123;
|
||||
scope.b = {c: 456};
|
||||
expect(scope.$eval("a", scope)).toEqual(123);
|
||||
expect(scope.$eval("b.c", scope)).toEqual(456);
|
||||
expect(scope.$eval("x.y.z", scope)).not.toBeDefined();
|
||||
});
|
||||
it('should parse comparison', function() {
|
||||
expect(scope.$eval("false")).toBeFalsy();
|
||||
expect(scope.$eval("!true")).toBeFalsy();
|
||||
expect(scope.$eval("1==1")).toBeTruthy();
|
||||
expect(scope.$eval("1!=2")).toBeTruthy();
|
||||
expect(scope.$eval("1<2")).toBeTruthy();
|
||||
expect(scope.$eval("1<=1")).toBeTruthy();
|
||||
expect(scope.$eval("1>2")).toEqual(1>2);
|
||||
expect(scope.$eval("2>=1")).toEqual(2>=1);
|
||||
expect(scope.$eval("true==2<3")).toEqual(true === 2<3);
|
||||
});
|
||||
|
||||
it('should resolve deeply nested paths (important for CSP mode)', function() {
|
||||
scope.a = {b: {c: {d: {e: {f: {g: {h: {i: {j: {k: {l: {m: {n: 'nooo!'}}}}}}}}}}}}};
|
||||
expect(scope.$eval("a.b.c.d.e.f.g.h.i.j.k.l.m.n", scope)).toBe('nooo!');
|
||||
});
|
||||
it('should parse logical', function() {
|
||||
expect(scope.$eval("0&&2")).toEqual(0&&2);
|
||||
expect(scope.$eval("0||2")).toEqual(0||2);
|
||||
expect(scope.$eval("0||1&&2")).toEqual(0||1&&2);
|
||||
});
|
||||
|
||||
it('should be forgiving', function() {
|
||||
scope.a = {b: 23};
|
||||
expect(scope.$eval('b')).toBeUndefined();
|
||||
expect(scope.$eval('a.x')).toBeUndefined();
|
||||
expect(scope.$eval('a.b.c.d')).toBeUndefined();
|
||||
});
|
||||
it('should parse string', function() {
|
||||
expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
|
||||
});
|
||||
|
||||
it('should support property names that collide with native object properties', function() {
|
||||
// regression
|
||||
scope.watch = 1;
|
||||
scope.constructor = 2;
|
||||
scope.toString = 3;
|
||||
it('should parse filters', function() {
|
||||
$filterProvider.register('substring', valueFn(function(input, start, end) {
|
||||
return input.substring(start, end);
|
||||
}));
|
||||
|
||||
expect(scope.$eval('watch', scope)).toBe(1);
|
||||
expect(scope.$eval('constructor', scope)).toBe(2);
|
||||
expect(scope.$eval('toString', scope)).toBe(3);
|
||||
});
|
||||
expect(function() {
|
||||
scope.$eval("1|nonexistent");
|
||||
}).toThrow(new Error("Unknown provider: nonexistentFilterProvider <- nonexistentFilter"));
|
||||
|
||||
it('should evaluate grouped expressions', function() {
|
||||
expect(scope.$eval("(1+2)*3")).toEqual((1+2)*3);
|
||||
});
|
||||
scope.offset = 3;
|
||||
expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
|
||||
expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
|
||||
});
|
||||
|
||||
it('should evaluate assignments', function() {
|
||||
expect(scope.$eval("a=12")).toEqual(12);
|
||||
expect(scope.a).toEqual(12);
|
||||
it('should access scope', function() {
|
||||
scope.a = 123;
|
||||
scope.b = {c: 456};
|
||||
expect(scope.$eval("a", scope)).toEqual(123);
|
||||
expect(scope.$eval("b.c", scope)).toEqual(456);
|
||||
expect(scope.$eval("x.y.z", scope)).not.toBeDefined();
|
||||
});
|
||||
|
||||
expect(scope.$eval("x.y.z=123;")).toEqual(123);
|
||||
expect(scope.x.y.z).toEqual(123);
|
||||
it('should resolve deeply nested paths (important for CSP mode)', function() {
|
||||
scope.a = {b: {c: {d: {e: {f: {g: {h: {i: {j: {k: {l: {m: {n: 'nooo!'}}}}}}}}}}}}};
|
||||
expect(scope.$eval("a.b.c.d.e.f.g.h.i.j.k.l.m.n", scope)).toBe('nooo!');
|
||||
});
|
||||
|
||||
expect(scope.$eval("a=123; b=234")).toEqual(234);
|
||||
expect(scope.a).toEqual(123);
|
||||
expect(scope.b).toEqual(234);
|
||||
});
|
||||
it('should be forgiving', function() {
|
||||
scope.a = {b: 23};
|
||||
expect(scope.$eval('b')).toBeUndefined();
|
||||
expect(scope.$eval('a.x')).toBeUndefined();
|
||||
expect(scope.$eval('a.b.c.d')).toBeUndefined();
|
||||
});
|
||||
|
||||
it('should evaluate function call without arguments', function() {
|
||||
scope['const'] = function(a,b){return 123;};
|
||||
expect(scope.$eval("const()")).toEqual(123);
|
||||
});
|
||||
it('should support property names that collide with native object properties', function() {
|
||||
// regression
|
||||
scope.watch = 1;
|
||||
scope.constructor = 2;
|
||||
scope.toString = 3;
|
||||
|
||||
it('should evaluate function call with arguments', function() {
|
||||
scope.add = function(a,b) {
|
||||
return a+b;
|
||||
};
|
||||
expect(scope.$eval("add(1,2)")).toEqual(3);
|
||||
});
|
||||
expect(scope.$eval('watch', scope)).toBe(1);
|
||||
expect(scope.$eval('constructor', scope)).toBe(2);
|
||||
expect(scope.$eval('toString', scope)).toBe(3);
|
||||
});
|
||||
|
||||
it('should evaluate function call from a return value', function() {
|
||||
scope.val = 33;
|
||||
scope.getter = function() { return function() { return this.val; }};
|
||||
expect(scope.$eval("getter()()")).toBe(33);
|
||||
});
|
||||
it('should evaluate grouped expressions', function() {
|
||||
expect(scope.$eval("(1+2)*3")).toEqual((1+2)*3);
|
||||
});
|
||||
|
||||
it('should evaluate multiplication and division', function() {
|
||||
scope.taxRate = 8;
|
||||
scope.subTotal = 100;
|
||||
expect(scope.$eval("taxRate / 100 * subTotal")).toEqual(8);
|
||||
expect(scope.$eval("subTotal * taxRate / 100")).toEqual(8);
|
||||
});
|
||||
it('should evaluate assignments', function() {
|
||||
expect(scope.$eval("a=12")).toEqual(12);
|
||||
expect(scope.a).toEqual(12);
|
||||
|
||||
it('should evaluate array', function() {
|
||||
expect(scope.$eval("[]").length).toEqual(0);
|
||||
expect(scope.$eval("[1, 2]").length).toEqual(2);
|
||||
expect(scope.$eval("[1, 2]")[0]).toEqual(1);
|
||||
expect(scope.$eval("[1, 2]")[1]).toEqual(2);
|
||||
});
|
||||
expect(scope.$eval("x.y.z=123;")).toEqual(123);
|
||||
expect(scope.x.y.z).toEqual(123);
|
||||
|
||||
it('should evaluate array access', function() {
|
||||
expect(scope.$eval("[1][0]")).toEqual(1);
|
||||
expect(scope.$eval("[[1]][0][0]")).toEqual(1);
|
||||
expect(scope.$eval("[].length")).toEqual(0);
|
||||
expect(scope.$eval("[1, 2].length")).toEqual(2);
|
||||
});
|
||||
expect(scope.$eval("a=123; b=234")).toEqual(234);
|
||||
expect(scope.a).toEqual(123);
|
||||
expect(scope.b).toEqual(234);
|
||||
});
|
||||
|
||||
it('should evaluate object', function() {
|
||||
expect(toJson(scope.$eval("{}"))).toEqual("{}");
|
||||
expect(toJson(scope.$eval("{a:'b'}"))).toEqual('{"a":"b"}');
|
||||
expect(toJson(scope.$eval("{'a':'b'}"))).toEqual('{"a":"b"}');
|
||||
expect(toJson(scope.$eval("{\"a\":'b'}"))).toEqual('{"a":"b"}');
|
||||
});
|
||||
it('should evaluate function call without arguments', function() {
|
||||
scope['const'] = function(a,b){return 123;};
|
||||
expect(scope.$eval("const()")).toEqual(123);
|
||||
});
|
||||
|
||||
it('should evaluate object access', function() {
|
||||
expect(scope.$eval("{false:'WC', true:'CC'}[false]")).toEqual("WC");
|
||||
});
|
||||
it('should evaluate function call with arguments', function() {
|
||||
scope.add = function(a,b) {
|
||||
return a+b;
|
||||
};
|
||||
expect(scope.$eval("add(1,2)")).toEqual(3);
|
||||
});
|
||||
|
||||
it('should evaluate JSON', function() {
|
||||
expect(toJson(scope.$eval("[{}]"))).toEqual("[{}]");
|
||||
expect(toJson(scope.$eval("[{a:[]}, {b:1}]"))).toEqual('[{"a":[]},{"b":1}]');
|
||||
});
|
||||
it('should evaluate function call from a return value', function() {
|
||||
scope.val = 33;
|
||||
scope.getter = function() { return function() { return this.val; }};
|
||||
expect(scope.$eval("getter()()")).toBe(33);
|
||||
});
|
||||
|
||||
it('should evaluate multiple statements', function() {
|
||||
expect(scope.$eval("a=1;b=3;a+b")).toEqual(4);
|
||||
expect(scope.$eval(";;1;;")).toEqual(1);
|
||||
});
|
||||
it('should evaluate multiplication and division', function() {
|
||||
scope.taxRate = 8;
|
||||
scope.subTotal = 100;
|
||||
expect(scope.$eval("taxRate / 100 * subTotal")).toEqual(8);
|
||||
expect(scope.$eval("subTotal * taxRate / 100")).toEqual(8);
|
||||
});
|
||||
|
||||
it('should evaluate object methods in correct context (this)', function() {
|
||||
var C = function () {
|
||||
this.a = 123;
|
||||
};
|
||||
C.prototype.getA = function() {
|
||||
return this.a;
|
||||
};
|
||||
it('should evaluate array', function() {
|
||||
expect(scope.$eval("[]").length).toEqual(0);
|
||||
expect(scope.$eval("[1, 2]").length).toEqual(2);
|
||||
expect(scope.$eval("[1, 2]")[0]).toEqual(1);
|
||||
expect(scope.$eval("[1, 2]")[1]).toEqual(2);
|
||||
});
|
||||
|
||||
scope.obj = new C();
|
||||
expect(scope.$eval("obj.getA()")).toEqual(123);
|
||||
expect(scope.$eval("obj['getA']()")).toEqual(123);
|
||||
});
|
||||
it('should evaluate array access', function() {
|
||||
expect(scope.$eval("[1][0]")).toEqual(1);
|
||||
expect(scope.$eval("[[1]][0][0]")).toEqual(1);
|
||||
expect(scope.$eval("[].length")).toEqual(0);
|
||||
expect(scope.$eval("[1, 2].length")).toEqual(2);
|
||||
});
|
||||
|
||||
it('should evaluate methods in correct context (this) in argument', function() {
|
||||
var C = function () {
|
||||
this.a = 123;
|
||||
};
|
||||
C.prototype.sum = function(value) {
|
||||
return this.a + value;
|
||||
};
|
||||
C.prototype.getA = function() {
|
||||
return this.a;
|
||||
};
|
||||
it('should evaluate object', function() {
|
||||
expect(toJson(scope.$eval("{}"))).toEqual("{}");
|
||||
expect(toJson(scope.$eval("{a:'b'}"))).toEqual('{"a":"b"}');
|
||||
expect(toJson(scope.$eval("{'a':'b'}"))).toEqual('{"a":"b"}');
|
||||
expect(toJson(scope.$eval("{\"a\":'b'}"))).toEqual('{"a":"b"}');
|
||||
});
|
||||
|
||||
scope.obj = new C();
|
||||
expect(scope.$eval("obj.sum(obj.getA())")).toEqual(246);
|
||||
expect(scope.$eval("obj['sum'](obj.getA())")).toEqual(246);
|
||||
});
|
||||
it('should evaluate object access', function() {
|
||||
expect(scope.$eval("{false:'WC', true:'CC'}[false]")).toEqual("WC");
|
||||
});
|
||||
|
||||
it('should evaluate objects on scope context', function() {
|
||||
scope.a = "abc";
|
||||
expect(scope.$eval("{a:a}").a).toEqual("abc");
|
||||
});
|
||||
it('should evaluate JSON', function() {
|
||||
expect(toJson(scope.$eval("[{}]"))).toEqual("[{}]");
|
||||
expect(toJson(scope.$eval("[{a:[]}, {b:1}]"))).toEqual('[{"a":[]},{"b":1}]');
|
||||
});
|
||||
|
||||
it('should evaluate field access on function call result', function() {
|
||||
scope.a = function() {
|
||||
return {name:'misko'};
|
||||
};
|
||||
expect(scope.$eval("a().name")).toEqual("misko");
|
||||
});
|
||||
it('should evaluate multiple statements', function() {
|
||||
expect(scope.$eval("a=1;b=3;a+b")).toEqual(4);
|
||||
expect(scope.$eval(";;1;;")).toEqual(1);
|
||||
});
|
||||
|
||||
it('should evaluate field access after array access', function () {
|
||||
scope.items = [{}, {name:'misko'}];
|
||||
expect(scope.$eval('items[1].name')).toEqual("misko");
|
||||
});
|
||||
it('should evaluate object methods in correct context (this)', function() {
|
||||
var C = function () {
|
||||
this.a = 123;
|
||||
};
|
||||
C.prototype.getA = function() {
|
||||
return this.a;
|
||||
};
|
||||
|
||||
it('should evaluate array assignment', function() {
|
||||
scope.items = [];
|
||||
scope.obj = new C();
|
||||
expect(scope.$eval("obj.getA()")).toEqual(123);
|
||||
expect(scope.$eval("obj['getA']()")).toEqual(123);
|
||||
});
|
||||
|
||||
expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
|
||||
expect(scope.$eval('items[1]')).toEqual("abc");
|
||||
// Dont know how to make this work....
|
||||
// expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
|
||||
// expect(scope.$eval('books[1]')).toEqual("moby");
|
||||
});
|
||||
it('should evaluate methods in correct context (this) in argument', function() {
|
||||
var C = function () {
|
||||
this.a = 123;
|
||||
};
|
||||
C.prototype.sum = function(value) {
|
||||
return this.a + value;
|
||||
};
|
||||
C.prototype.getA = function() {
|
||||
return this.a;
|
||||
};
|
||||
|
||||
it('should evaluate grouped filters', function() {
|
||||
scope.name = 'MISKO';
|
||||
expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
|
||||
expect(scope.$eval('n')).toEqual('misko');
|
||||
});
|
||||
scope.obj = new C();
|
||||
expect(scope.$eval("obj.sum(obj.getA())")).toEqual(246);
|
||||
expect(scope.$eval("obj['sum'](obj.getA())")).toEqual(246);
|
||||
});
|
||||
|
||||
it('should evaluate remainder', function() {
|
||||
expect(scope.$eval('1%2')).toEqual(1);
|
||||
});
|
||||
it('should evaluate objects on scope context', function() {
|
||||
scope.a = "abc";
|
||||
expect(scope.$eval("{a:a}").a).toEqual("abc");
|
||||
});
|
||||
|
||||
it('should evaluate sum with undefined', function() {
|
||||
expect(scope.$eval('1+undefined')).toEqual(1);
|
||||
expect(scope.$eval('undefined+1')).toEqual(1);
|
||||
});
|
||||
it('should evaluate field access on function call result', function() {
|
||||
scope.a = function() {
|
||||
return {name:'misko'};
|
||||
};
|
||||
expect(scope.$eval("a().name")).toEqual("misko");
|
||||
});
|
||||
|
||||
it('should throw exception on non-closed bracket', function() {
|
||||
expect(function() {
|
||||
scope.$eval('[].count(');
|
||||
}).toThrow('Unexpected end of expression: [].count(');
|
||||
});
|
||||
it('should evaluate field access after array access', function () {
|
||||
scope.items = [{}, {name:'misko'}];
|
||||
expect(scope.$eval('items[1].name')).toEqual("misko");
|
||||
});
|
||||
|
||||
it('should evaluate double negation', function() {
|
||||
expect(scope.$eval('true')).toBeTruthy();
|
||||
expect(scope.$eval('!true')).toBeFalsy();
|
||||
expect(scope.$eval('!!true')).toBeTruthy();
|
||||
expect(scope.$eval('{true:"a", false:"b"}[!!true]')).toEqual('a');
|
||||
});
|
||||
it('should evaluate array assignment', function() {
|
||||
scope.items = [];
|
||||
|
||||
it('should evaluate negation', function() {
|
||||
expect(scope.$eval("!false || true")).toEqual(!false || true);
|
||||
expect(scope.$eval("!11 == 10")).toEqual(!11 == 10);
|
||||
expect(scope.$eval("12/6/2")).toEqual(12/6/2);
|
||||
});
|
||||
expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
|
||||
expect(scope.$eval('items[1]')).toEqual("abc");
|
||||
// Dont know how to make this work....
|
||||
// expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
|
||||
// expect(scope.$eval('books[1]')).toEqual("moby");
|
||||
});
|
||||
|
||||
it('should evaluate exclamation mark', function() {
|
||||
expect(scope.$eval('suffix = "!"')).toEqual('!');
|
||||
});
|
||||
it('should evaluate grouped filters', function() {
|
||||
scope.name = 'MISKO';
|
||||
expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
|
||||
expect(scope.$eval('n')).toEqual('misko');
|
||||
});
|
||||
|
||||
it('should evaluate minus', function() {
|
||||
expect(scope.$eval("{a:'-'}")).toEqual({a: "-"});
|
||||
});
|
||||
it('should evaluate remainder', function() {
|
||||
expect(scope.$eval('1%2')).toEqual(1);
|
||||
});
|
||||
|
||||
it('should evaluate undefined', function() {
|
||||
expect(scope.$eval("undefined")).not.toBeDefined();
|
||||
expect(scope.$eval("a=undefined")).not.toBeDefined();
|
||||
expect(scope.a).not.toBeDefined();
|
||||
});
|
||||
it('should evaluate sum with undefined', function() {
|
||||
expect(scope.$eval('1+undefined')).toEqual(1);
|
||||
expect(scope.$eval('undefined+1')).toEqual(1);
|
||||
});
|
||||
|
||||
it('should allow assignment after array dereference', function() {
|
||||
scope.obj = [{}];
|
||||
scope.$eval('obj[0].name=1');
|
||||
expect(scope.obj.name).toBeUndefined();
|
||||
expect(scope.obj[0].name).toEqual(1);
|
||||
});
|
||||
it('should throw exception on non-closed bracket', function() {
|
||||
expect(function() {
|
||||
scope.$eval('[].count(');
|
||||
}).toThrow('Unexpected end of expression: [].count(');
|
||||
});
|
||||
|
||||
it('should short-circuit AND operator', function() {
|
||||
scope.run = function() {
|
||||
throw "IT SHOULD NOT HAVE RUN";
|
||||
};
|
||||
expect(scope.$eval('false && run()')).toBe(false);
|
||||
});
|
||||
it('should evaluate double negation', function() {
|
||||
expect(scope.$eval('true')).toBeTruthy();
|
||||
expect(scope.$eval('!true')).toBeFalsy();
|
||||
expect(scope.$eval('!!true')).toBeTruthy();
|
||||
expect(scope.$eval('{true:"a", false:"b"}[!!true]')).toEqual('a');
|
||||
});
|
||||
|
||||
it('should short-circuit OR operator', function() {
|
||||
scope.run = function() {
|
||||
throw "IT SHOULD NOT HAVE RUN";
|
||||
};
|
||||
expect(scope.$eval('true || run()')).toBe(true);
|
||||
});
|
||||
it('should evaluate negation', function() {
|
||||
expect(scope.$eval("!false || true")).toEqual(!false || true);
|
||||
expect(scope.$eval("!11 == 10")).toEqual(!11 == 10);
|
||||
expect(scope.$eval("12/6/2")).toEqual(12/6/2);
|
||||
});
|
||||
|
||||
it('should evaluate exclamation mark', function() {
|
||||
expect(scope.$eval('suffix = "!"')).toEqual('!');
|
||||
});
|
||||
|
||||
it('should evaluate minus', function() {
|
||||
expect(scope.$eval("{a:'-'}")).toEqual({a: "-"});
|
||||
});
|
||||
|
||||
it('should evaluate undefined', function() {
|
||||
expect(scope.$eval("undefined")).not.toBeDefined();
|
||||
expect(scope.$eval("a=undefined")).not.toBeDefined();
|
||||
expect(scope.a).not.toBeDefined();
|
||||
});
|
||||
|
||||
it('should allow assignment after array dereference', function() {
|
||||
scope.obj = [{}];
|
||||
scope.$eval('obj[0].name=1');
|
||||
expect(scope.obj.name).toBeUndefined();
|
||||
expect(scope.obj[0].name).toEqual(1);
|
||||
});
|
||||
|
||||
it('should short-circuit AND operator', function() {
|
||||
scope.run = function() {
|
||||
throw "IT SHOULD NOT HAVE RUN";
|
||||
};
|
||||
expect(scope.$eval('false && run()')).toBe(false);
|
||||
});
|
||||
|
||||
it('should short-circuit OR operator', function() {
|
||||
scope.run = function() {
|
||||
throw "IT SHOULD NOT HAVE RUN";
|
||||
};
|
||||
expect(scope.$eval('true || run()')).toBe(true);
|
||||
});
|
||||
|
||||
|
||||
describe('promises', function() {
|
||||
var deferred, promise, q;
|
||||
it('should support method calls on primitive types', function() {
|
||||
scope.empty = '';
|
||||
scope.zero = 0;
|
||||
scope.bool = false;
|
||||
|
||||
beforeEach(inject(function($q) {
|
||||
q = $q;
|
||||
deferred = q.defer();
|
||||
promise = deferred.promise;
|
||||
}));
|
||||
expect(scope.$eval('empty.substr(0)')).toBe('');
|
||||
expect(scope.$eval('zero.toString()')).toBe('0');
|
||||
expect(scope.$eval('bool.toString()')).toBe('false');
|
||||
});
|
||||
|
||||
describe('{{promise}}', function() {
|
||||
it('should evaluated resolved promise and get its value', function() {
|
||||
deferred.resolve('hello!');
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe('hello!');
|
||||
|
||||
describe('promises', function() {
|
||||
var deferred, promise, q;
|
||||
|
||||
beforeEach(inject(function($q) {
|
||||
q = $q;
|
||||
deferred = q.defer();
|
||||
promise = deferred.promise;
|
||||
}));
|
||||
|
||||
describe('{{promise}}', function() {
|
||||
it('should evaluated resolved promise and get its value', function() {
|
||||
deferred.resolve('hello!');
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe('hello!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluated rejected promise and ignore the rejection reason', function() {
|
||||
deferred.reject('sorry');
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('gretting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate a promise and eventualy get its value', function() {
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
|
||||
deferred.resolve('hello!');
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe('hello!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate a promise and eventualy ignore its rejection', function() {
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
|
||||
deferred.reject('sorry');
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
});
|
||||
});
|
||||
|
||||
describe('dereferencing', function() {
|
||||
it('should evaluate and dereference properties leading to and from a promise', function() {
|
||||
scope.obj = {greeting: promise};
|
||||
expect(scope.$eval('obj.greeting')).toBe(undefined);
|
||||
expect(scope.$eval('obj.greeting.polite')).toBe(undefined);
|
||||
|
||||
it('should evaluated rejected promise and ignore the rejection reason', function() {
|
||||
deferred.reject('sorry');
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('gretting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
});
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj.greeting')).toBe(undefined);
|
||||
expect(scope.$eval('obj.greeting.polite')).toBe(undefined);
|
||||
|
||||
deferred.resolve({polite: 'Good morning!'});
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj.greeting')).toEqual({polite: 'Good morning!'});
|
||||
expect(scope.$eval('obj.greeting.polite')).toBe('Good morning!');
|
||||
});
|
||||
|
||||
it('should evaluate and dereference properties leading to and from a promise via bracket ' +
|
||||
'notation', function() {
|
||||
scope.obj = {greeting: promise};
|
||||
expect(scope.$eval('obj["greeting"]')).toBe(undefined);
|
||||
expect(scope.$eval('obj["greeting"]["polite"]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj["greeting"]')).toBe(undefined);
|
||||
expect(scope.$eval('obj["greeting"]["polite"]')).toBe(undefined);
|
||||
|
||||
deferred.resolve({polite: 'Good morning!'});
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj["greeting"]')).toEqual({polite: 'Good morning!'});
|
||||
expect(scope.$eval('obj["greeting"]["polite"]')).toBe('Good morning!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate a promise and eventualy get its value', function() {
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
it('should evaluate and dereference array references leading to and from a promise',
|
||||
function() {
|
||||
scope.greetings = [promise];
|
||||
expect(scope.$eval('greetings[0]')).toBe(undefined);
|
||||
expect(scope.$eval('greetings[0][0]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greetings[0]')).toBe(undefined);
|
||||
expect(scope.$eval('greetings[0][0]')).toBe(undefined);
|
||||
|
||||
deferred.resolve('hello!');
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe('hello!');
|
||||
});
|
||||
deferred.resolve(['Hi!', 'Cau!']);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greetings[0]')).toEqual(['Hi!', 'Cau!']);
|
||||
expect(scope.$eval('greetings[0][0]')).toBe('Hi!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate a promise and eventualy ignore its rejection', function() {
|
||||
scope.greeting = promise;
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
it('should evaluate and dereference promises used as function arguments', function() {
|
||||
scope.greet = function(name) { return 'Hi ' + name + '!'; };
|
||||
scope.name = promise;
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi undefined!');
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi undefined!');
|
||||
|
||||
deferred.reject('sorry');
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greeting')).toBe(undefined);
|
||||
deferred.resolve('Veronica');
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi undefined!');
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi Veronica!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate and dereference promises used as array indexes', function() {
|
||||
scope.childIndex = promise;
|
||||
scope.kids = ['Adam', 'Veronica', 'Elisa'];
|
||||
expect(scope.$eval('kids[childIndex]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childIndex]')).toBe(undefined);
|
||||
|
||||
deferred.resolve(1);
|
||||
expect(scope.$eval('kids[childIndex]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childIndex]')).toBe('Veronica');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate and dereference promises used as keys in bracket notation', function() {
|
||||
scope.childKey = promise;
|
||||
scope.kids = {'a': 'Adam', 'v': 'Veronica', 'e': 'Elisa'};
|
||||
|
||||
expect(scope.$eval('kids[childKey]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childKey]')).toBe(undefined);
|
||||
|
||||
deferred.resolve('v');
|
||||
expect(scope.$eval('kids[childKey]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childKey]')).toBe('Veronica');
|
||||
});
|
||||
|
||||
|
||||
it('should not mess with the promise if it was not directly evaluated', function() {
|
||||
scope.obj = {greeting: promise, username: 'hi'};
|
||||
var obj = scope.$eval('obj');
|
||||
expect(obj.username).toEqual('hi');
|
||||
expect(typeof obj.greeting.then).toBe('function');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('dereferencing', function() {
|
||||
it('should evaluate and dereference properties leading to and from a promise', function() {
|
||||
scope.obj = {greeting: promise};
|
||||
expect(scope.$eval('obj.greeting')).toBe(undefined);
|
||||
expect(scope.$eval('obj.greeting.polite')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj.greeting')).toBe(undefined);
|
||||
expect(scope.$eval('obj.greeting.polite')).toBe(undefined);
|
||||
|
||||
deferred.resolve({polite: 'Good morning!'});
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj.greeting')).toEqual({polite: 'Good morning!'});
|
||||
expect(scope.$eval('obj.greeting.polite')).toBe('Good morning!');
|
||||
});
|
||||
|
||||
it('should evaluate and dereference properties leading to and from a promise via bracket ' +
|
||||
'notation', function() {
|
||||
scope.obj = {greeting: promise};
|
||||
expect(scope.$eval('obj["greeting"]')).toBe(undefined);
|
||||
expect(scope.$eval('obj["greeting"]["polite"]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj["greeting"]')).toBe(undefined);
|
||||
expect(scope.$eval('obj["greeting"]["polite"]')).toBe(undefined);
|
||||
|
||||
deferred.resolve({polite: 'Good morning!'});
|
||||
scope.$digest();
|
||||
expect(scope.$eval('obj["greeting"]')).toEqual({polite: 'Good morning!'});
|
||||
expect(scope.$eval('obj["greeting"]["polite"]')).toBe('Good morning!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate and dereference array references leading to and from a promise',
|
||||
function() {
|
||||
scope.greetings = [promise];
|
||||
expect(scope.$eval('greetings[0]')).toBe(undefined);
|
||||
expect(scope.$eval('greetings[0][0]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greetings[0]')).toBe(undefined);
|
||||
expect(scope.$eval('greetings[0][0]')).toBe(undefined);
|
||||
|
||||
deferred.resolve(['Hi!', 'Cau!']);
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greetings[0]')).toEqual(['Hi!', 'Cau!']);
|
||||
expect(scope.$eval('greetings[0][0]')).toBe('Hi!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate and dereference promises used as function arguments', function() {
|
||||
scope.greet = function(name) { return 'Hi ' + name + '!'; };
|
||||
scope.name = promise;
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi undefined!');
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi undefined!');
|
||||
|
||||
deferred.resolve('Veronica');
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi undefined!');
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('greet(name)')).toBe('Hi Veronica!');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate and dereference promises used as array indexes', function() {
|
||||
scope.childIndex = promise;
|
||||
scope.kids = ['Adam', 'Veronica', 'Elisa'];
|
||||
expect(scope.$eval('kids[childIndex]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childIndex]')).toBe(undefined);
|
||||
|
||||
deferred.resolve(1);
|
||||
expect(scope.$eval('kids[childIndex]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childIndex]')).toBe('Veronica');
|
||||
});
|
||||
|
||||
|
||||
it('should evaluate and dereference promises used as keys in bracket notation', function() {
|
||||
scope.childKey = promise;
|
||||
scope.kids = {'a': 'Adam', 'v': 'Veronica', 'e': 'Elisa'};
|
||||
|
||||
expect(scope.$eval('kids[childKey]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childKey]')).toBe(undefined);
|
||||
|
||||
deferred.resolve('v');
|
||||
expect(scope.$eval('kids[childKey]')).toBe(undefined);
|
||||
|
||||
scope.$digest();
|
||||
expect(scope.$eval('kids[childKey]')).toBe('Veronica');
|
||||
});
|
||||
|
||||
|
||||
it('should not mess with the promise if it was not directly evaluated', function() {
|
||||
scope.obj = {greeting: promise, username: 'hi'};
|
||||
var obj = scope.$eval('obj');
|
||||
expect(obj.username).toEqual('hi');
|
||||
expect(typeof obj.greeting.then).toBe('function');
|
||||
});
|
||||
describe('assignable', function() {
|
||||
it('should expose assignment function', inject(function($parse) {
|
||||
var fn = $parse('a');
|
||||
expect(fn.assign).toBeTruthy();
|
||||
var scope = {};
|
||||
fn.assign(scope, 123);
|
||||
expect(scope).toEqual({a:123});
|
||||
}));
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
describe('assignable', function() {
|
||||
it('should expose assignment function', inject(function($parse) {
|
||||
var fn = $parse('a');
|
||||
expect(fn.assign).toBeTruthy();
|
||||
var scope = {};
|
||||
fn.assign(scope, 123);
|
||||
expect(scope).toEqual({a:123});
|
||||
}));
|
||||
});
|
||||
describe('locals', function() {
|
||||
it('should expose local variables', inject(function($parse) {
|
||||
expect($parse('a')({a: 0}, {a: 1})).toEqual(1);
|
||||
expect($parse('add(a,b)')({b: 1, add: function(a, b) { return a + b; }}, {a: 2})).toEqual(3);
|
||||
}));
|
||||
|
||||
|
||||
describe('locals', function() {
|
||||
it('should expose local variables', inject(function($parse) {
|
||||
expect($parse('a')({a: 0}, {a: 1})).toEqual(1);
|
||||
expect($parse('add(a,b)')({b: 1, add: function(a, b) { return a + b; }}, {a: 2})).toEqual(3);
|
||||
}));
|
||||
|
||||
it('should expose traverse locals', inject(function($parse) {
|
||||
expect($parse('a.b')({a: {b: 0}}, {a: {b:1}})).toEqual(1);
|
||||
expect($parse('a.b')({a: null}, {a: {b:1}})).toEqual(1);
|
||||
expect($parse('a.b')({a: {b: 0}}, {a: null})).toEqual(undefined);
|
||||
}));
|
||||
it('should expose traverse locals', inject(function($parse) {
|
||||
expect($parse('a.b')({a: {b: 0}}, {a: {b:1}})).toEqual(1);
|
||||
expect($parse('a.b')({a: null}, {a: {b:1}})).toEqual(1);
|
||||
expect($parse('a.b')({a: {b: 0}}, {a: null})).toEqual(undefined);
|
||||
}));
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue