');
c.scope.$set("count", 0);
- c.scope.addWatchListener("$anchor.counter", function(newValue, oldValue){
+ c.scope.$watch("$anchor.counter", function(newValue, oldValue){
log += oldValue + "->" + newValue + ";";
});
assertEquals(0, c.scope.$get("count"));
@@ -738,7 +748,7 @@ BinderTest.prototype.testItShouldCallListenersWhenAnchorChanges = function() {
assertEquals(3, c.scope.$get("count"));
};
-BinderTest.prototype.testParseQueryString = function(){
+BinderTest.prototype.XtestParseQueryString = function(){
var binder = new Binder();
assertJsonEquals({"a":"1"}, binder.parseQueryString("a=1"));
assertJsonEquals({"a":"1", "b":"two"}, binder.parseQueryString("a=1&b=two"));
@@ -751,49 +761,57 @@ BinderTest.prototype.testParseQueryString = function(){
};
-BinderTest.prototype.testSetBinderAnchorTriggersListeners = function(){
+BinderTest.prototype.XtestSetBinderAnchorTriggersListeners = function(){
expectAsserts(2);
var doc = this.compile("
");
- doc.scope.addWatchListener("$anchor.name", function(newVal, oldVal) {
+ doc.scope.$watch("$anchor.name", function(newVal, oldVal) {
assertEquals("new", newVal);
assertEquals(undefined, oldVal);
});
- doc.binder.anchor.name = "new";
+ doc.$anchor.name = "new";
doc.binder.onUrlChange("http://base#name=new");
};
BinderTest.prototype.testItShouldDisplayErrorWhenActionIsSyntacticlyIncorect = function(){
- var c = this.compile(
+ var c = this.compile('
' +
'
');
+ var first = jqLite(c.node[0].childNodes[0]);
+ var second = jqLite(c.node[0].childNodes[1]);
+
+ first.click();
assertEquals("ABC", c.scope.$get('greeting'));
- assertTrue(c.node.find(":input:last").hasClass("ng-exception"));
+
+ second.click();
+ assertTrue(second.hasClass("ng-exception"));
};
BinderTest.prototype.testItShouldSelectTheCorrectRadioBox = function() {
- var c = this.compile(
+ var c = this.compile('
' +
'
');
+ var female = jqLite(c.node[0].childNodes[0]);
+ var male = jqLite(c.node[0].childNodes[1]);
- c.node.find("input[value=female]").click();
+ female.click();
assertEquals("female", c.scope.$get("sex"));
- assertEquals(1, c.node.find("input:checked").size());
- assertEquals("female", c.node.find("input:checked").attr("value"));
+ assertEquals(true, female[0].checked);
+ assertEquals(false, male[0].checked);
+ assertEquals("female", female.val());
- c.node.find("input[value=male]").click();
+ male.click();
assertEquals("male", c.scope.$get("sex"));
- assertEquals(1, c.node.find("input:checked").size());
- assertEquals("male", c.node.find("input:checked").attr("value"));
+ assertEquals(false, female[0].checked);
+ assertEquals(true, male[0].checked);
+ assertEquals("male", male.val());
};
BinderTest.prototype.testItShouldListenOnRightScope = function() {
var c = this.compile(
- '
' +
- '
');
- c.binder.executeInit();
+ '
');
c.scope.$eval();
assertEquals(0, c.scope.$get("counter"));
assertEquals(0, c.scope.$get("gCounter"));
@@ -805,11 +823,13 @@ BinderTest.prototype.testItShouldListenOnRightScope = function() {
};
BinderTest.prototype.testItShouldRepeatOnHashes = function() {
- var x = this.compile('
');
+ var x = this.compile('
');
x.scope.$eval();
- assertEquals(
- '
a0
' +
- '
b1
',
+ assertEquals('
' +
+ '<#comment>' +
+ 'a0 ' +
+ 'b1 ' +
+ ' ',
sortedHtml(x.node));
};
diff --git a/test/ScenarioSpec.js b/test/ScenarioSpec.js
index 9603a28e..5b88a175 100644
--- a/test/ScenarioSpec.js
+++ b/test/ScenarioSpec.js
@@ -3,8 +3,8 @@ describe("ScenarioSpec: Compilation", function(){
var node = jqLite('
{{b=a+1}}
')[0];
var scope = angular.compile(node);
scope.$init();
- expect(scope.$get('a')).toEqual(1);
- expect(scope.$get('b')).toEqual(2);
+ expect(scope.a).toEqual(1);
+ expect(scope.b).toEqual(2);
});
it("should compile jQuery node and return scope", function(){
diff --git a/test/ScopeSpec.js b/test/ScopeSpec.js
index 1e50b275..7e1a899f 100644
--- a/test/ScopeSpec.js
+++ b/test/ScopeSpec.js
@@ -33,16 +33,18 @@ describe('scope/model', function(){
it('should watch an expression for change', function(){
var model = createScope();
model.oldValue = "";
- var count = 0;
+ var nameCount = 0, evalCount = 0;
model.name = 'adam';
- model.$watch('name', function(){ count ++; });
+ model.$watch('name', function(){ nameCount ++; });
model.$watch(function(){return model.name;}, function(newValue, oldValue){
this.newValue = newValue;
this.oldValue = oldValue;
});
+ model.$onEval(function(){evalCount ++;});
model.name = 'misko';
model.$eval();
- expect(count).toEqual(2); // since watches trigger $eval
+ expect(nameCount).toEqual(1);
+ expect(evalCount).toEqual(1);
expect(model.newValue).toEqual('misko');
expect(model.oldValue).toEqual('adam');
});
diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index 343698af..4eef1ac3 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -80,6 +80,11 @@ describe("directives", function(){
expect(element.text()).toEqual('misko:swe;shyam:set;');
});
+ it('should set ng-repeat to [] if undefinde', function(){
+ var scope = compile('
');
+ expect(scope.items).toEqual([]);
+ });
+
it('should error on wrong parsing of ng-repeat', function(){
var scope = compile('
');
var log = "";
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index 7c16828d..312b1e42 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -37,6 +37,10 @@ MockLocation.prototype.set = function(url){
this.url = url;
};
+function childNode(element, index) {
+ return jqLite(element[0].childNodes[index]);
+}
+
function sortedHtml(element) {
var html = "";
(function toString(node) {
diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js
index 152b01f3..d041220b 100644
--- a/test/widgetsSpec.js
+++ b/test/widgetsSpec.js
@@ -14,10 +14,8 @@ describe("input widget", function(){
});
afterEach(function(){
- if (element) element.remove();
- var oldCache = jqCache;
- jqCache = {};
- expect(size(oldCache)).toEqual(0);
+ if (element && element.dealoc) element.dealoc();
+ expect(size(jqCache)).toEqual(0);
});
it('should input-text auto init and handle keyup/change events', function(){
@@ -179,7 +177,7 @@ describe("input widget", function(){
});
it('should report error on assignment error', function(){
- compile('
');
+ compile('
');
expect(element.hasClass('ng-exception')).toBeTruthy();
});
--
cgit v1.2.3