diff options
| -rw-r--r-- | lib/jstestdriver/JsTestDriver.jar | bin | 3065205 -> 3081196 bytes | |||
| -rw-r--r-- | src/API.js | 2 | ||||
| -rw-r--r-- | src/Angular.js | 3 | ||||
| -rwxr-xr-x | test.sh | 2 | ||||
| -rw-r--r-- | test/ApiTest.js | 2 | ||||
| -rw-r--r-- | test/BinderTest.js | 2 | ||||
| -rw-r--r-- | test/testabilityPatch.js | 5 |
7 files changed, 9 insertions, 7 deletions
diff --git a/lib/jstestdriver/JsTestDriver.jar b/lib/jstestdriver/JsTestDriver.jar Binary files differindex 256bfad9..fea70000 100644 --- a/lib/jstestdriver/JsTestDriver.jar +++ b/lib/jstestdriver/JsTestDriver.jar @@ -319,5 +319,7 @@ defineApi('Object', [angularGlobal, angularCollection, angularObject], ['keys', 'values']); defineApi('String', [angularGlobal, angularString], []); defineApi('Date', [angularGlobal, angularDate], []); +//IE bug +angular['Date']['toString'] = angularDate['toString']; defineApi('Function', [angularGlobal, angularCollection, angularFunction], ['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']); diff --git a/src/Angular.js b/src/Angular.js index bfbe8ee9..f06562da 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -20,7 +20,8 @@ if (typeof Node == 'undefined') { function noop() {} if (!window['console']) window['console']={'log':noop, 'error':noop}; -var consoleNode, jQuery, msie, +var consoleNode, msie, + jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy foreach = _.each, extend = _.extend, angular = window['angular'] || (window['angular'] = {}), @@ -1,2 +1,2 @@ -java -jar lib/jstestdriver/JsTestDriver.jar --tests all | grep -v lib/jasmine +java -jar lib/jstestdriver/JsTestDriver.jar --tests all | grep -v lib/jasmine diff --git a/test/ApiTest.js b/test/ApiTest.js index 250a27b1..fc9190ed 100644 --- a/test/ApiTest.js +++ b/test/ApiTest.js @@ -204,7 +204,7 @@ ApiTest.prototype.testQuoteString = function(){ }; ApiTest.prototype.testQuoteStringBug = function(){ - assertEquals(angular.String.quote('"7\\\\\\\"7"', "7\\\"7")); + assertEquals('"7\\\\\\\"7"', angular.String.quote("7\\\"7")); }; ApiTest.prototype.testQuoteUnicode = function(){ diff --git a/test/BinderTest.js b/test/BinderTest.js index 6ef46fae..cf2fa31a 100644 --- a/test/BinderTest.js +++ b/test/BinderTest.js @@ -401,7 +401,7 @@ BinderTest.prototype.testRepeaterUpdateBindings = function(){ }; BinderTest.prototype.testRepeaterContentDoesNotBind = function(){ - var a = compile('<ul><LI ng-repeat="item in model.items"><span ng-bind="item.a"/></li></ul>'); + var a = compile('<ul><LI ng-repeat="item in model.items"><span ng-bind="item.a"></span></li></ul>'); a.scope.set('model', {items:[{a:"A"}]}); a.binder.updateView(); assertEquals('<ul>' + diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js index 8fac7598..d9aed6f2 100644 --- a/test/testabilityPatch.js +++ b/test/testabilityPatch.js @@ -1,5 +1,3 @@ -TestCase = function(name) { return jstestdriver.testCaseManager.TestCase(name); }; - HIDDEN = jQuery.browser.msie ? '' : jQuery.browser.safari ? @@ -7,7 +5,7 @@ HIDDEN = jQuery.browser.msie ? ' style="display: none;"'; msie = jQuery.browser.msie; -alert = function(msg) {jstestdriver.console.log("ALERT: " + msg);}; +//alert = function(msg) {jstestdriver.console.log("ALERT: " + msg);}; function noop(){} @@ -35,6 +33,7 @@ function report(reportTest){ }); } + MockLocation = function() { this.url = "http://server"; }; |