From 2a30a02f015dd54846bb62d1f05e82b3cf76ef9f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 27 Jul 2010 15:54:50 -0700
Subject: fix preventDefault for events

---
 test/directivesSpec.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index 8a7da41d..278f9c4c 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -160,13 +160,15 @@ describe("directives", function(){
     expect(scope.$get('count')).toEqual(1);
   });
 
-  it('should ng:click', function(){
-    var scope = compile('<div ng:click="clicked = true"></div>');
-    scope.$eval();
-    expect(scope.$get('clicked')).toBeFalsy();
+  describe('ng:click', function(){
+    it('should fire event', function(){
+      var scope = compile('<div ng:click="clicked = true"></div>');
+      scope.$eval();
+      expect(scope.$get('clicked')).toBeFalsy();
 
-    element.trigger('click');
-    expect(scope.$get('clicked')).toEqual(true);
+      element.trigger('click');
+      expect(scope.$get('clicked')).toEqual(true);
+    });
   });
 
   it('should ng:class', function(){
-- 
cgit v1.2.3


From 1b768b84439e725010acc943ebfda462e49d3704 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 29 Jul 2010 12:50:14 -0700
Subject: refactored $location service so that it correctly updates under all
 conditions

---
 test/servicesSpec.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/servicesSpec.js b/test/servicesSpec.js
index 91538703..cb5c9b30 100644
--- a/test/servicesSpec.js
+++ b/test/servicesSpec.js
@@ -106,7 +106,7 @@ describe("service", function(){
       expect(scope.$location.hashPath).toEqual('');
       expect(scope.$location.hashSearch).toEqual({});
 
-      expect(scope.$location.toString()).toEqual('file:///Users/Shared/misko/work/angular.js/scenario/widgets.html#');
+      expect(scope.$location.toString()).toEqual('file:///Users/Shared/misko/work/angular.js/scenario/widgets.html');
     });
 
     it('should update url on hash change', function(){
@@ -123,6 +123,14 @@ describe("service", function(){
       expect(scope.$location.hash).toEqual('?a=b');
     });
 
+    it("should parse url which contains - in host", function(){
+      scope.$location.parse('http://a-b1.c-d.09/path');
+      expect(scope.$location.href).toEqual('http://a-b1.c-d.09/path');
+      expect(scope.$location.protocol).toEqual('http');
+      expect(scope.$location.host).toEqual('a-b1.c-d.09');
+      expect(scope.$location.path).toEqual('/path');
+    });
+
     it('should update hash before any processing', function(){
       var scope = compile('<div>');
       var log = '';
@@ -136,15 +144,6 @@ describe("service", function(){
       scope.$eval();
       expect(log).toEqual('/abc;');
     });
-
-    it("should parse url which contains - in host", function(){
-      scope.$location.parse('http://a-b1.c-d.09/path');
-      expect(scope.$location.href).toEqual('http://a-b1.c-d.09/path');
-      expect(scope.$location.protocol).toEqual('http');
-      expect(scope.$location.host).toEqual('a-b1.c-d.09');
-      expect(scope.$location.path).toEqual('/path');
-    });
-
   });
 
   describe("$invalidWidgets", function(){
-- 
cgit v1.2.3


From cdda664f8990351453baa26fc3dcd53329e72e68 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 30 Jul 2010 10:56:36 -0700
Subject: fix up the $location encoding

---
 test/servicesSpec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/servicesSpec.js b/test/servicesSpec.js
index cb5c9b30..ffd01267 100644
--- a/test/servicesSpec.js
+++ b/test/servicesSpec.js
@@ -91,7 +91,7 @@ describe("service", function(){
       scope.$location.hashPath = 'page=http://path';
       scope.$location.hashSearch = {k:'a=b'};
 
-      expect(scope.$location.toString()).toEqual('http://host:123/p/a/t/h.html?query=value#page=http://path?k=a%3Db');
+      expect(scope.$location.toString()).toEqual('http://host:123/p/a/t/h.html?query=value#page%3Dhttp%3A//path?k=a%3Db');
     });
 
     it('should parse file://', function(){
-- 
cgit v1.2.3


From 059703495dc703354056f1d16a73591959852370 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 30 Jul 2010 15:19:43 -0700
Subject: rename textMarkup to markup

---
 test/CompilerSpec.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/CompilerSpec.js b/test/CompilerSpec.js
index 3736ff4e..1091337b 100644
--- a/test/CompilerSpec.js
+++ b/test/CompilerSpec.js
@@ -1,5 +1,5 @@
 describe('compiler', function(){
-  var compiler, textMarkup, directives, widgets, compile, log;
+  var compiler, markup, directives, widgets, compile, log;
 
   beforeEach(function(){
     log = "";
@@ -20,10 +20,10 @@ describe('compiler', function(){
       }
 
     };
-    textMarkup = [];
+    markup = [];
     attrMarkup = [];
     widgets = extensionMap({}, 'widget');
-    compiler = new Compiler(textMarkup, attrMarkup, directives, widgets);
+    compiler = new Compiler(markup, attrMarkup, directives, widgets);
     compile = function(html){
       var e = jqLite("<div>" + html + "</div>");
       var scope = compiler.compile(e)(e);
@@ -94,7 +94,7 @@ describe('compiler', function(){
   });
 
   it('should process markup before directives', function(){
-    textMarkup.push(function(text, textNode, parentNode) {
+    markup.push(function(text, textNode, parentNode) {
       if (text == 'middle') {
         expect(textNode.text()).toEqual(text);
         parentNode.attr('hello', text);
@@ -126,7 +126,7 @@ describe('compiler', function(){
       this.directives(true);
       return noop;
     };
-    textMarkup.push(function(text, textNode, parent){
+    markup.push(function(text, textNode, parent){
       if (text == '{{1+2}}')
         parent.text('3');
     });
-- 
cgit v1.2.3