aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMisko Hevery2012-03-26 21:18:01 -0700
committerMisko Hevery2012-03-28 11:16:36 -0700
commit8218c4b60b82927234cf545253266f288fa936c2 (patch)
treece26aa1e0f273a81c7f38c85aa9849a6675f6c59 /test
parent2430f52bb97fa9d682e5f028c977c5bf94c5ec38 (diff)
downloadangular.js-8218c4b60b82927234cf545253266f288fa936c2.tar.bz2
chore(Rakefile): get ready for modules
Diffstat (limited to 'test')
-rw-r--r--test/ngMock/angular-mocksSpec.js3
-rw-r--r--test/ngResource/resourceSpec.js (renamed from test/ng/resourceSpec.js)3
-rw-r--r--test/testabilityPatch.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 2527ca48..d80b1976 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -1,6 +1,7 @@
'use strict';
describe('ngMock', function() {
+ var noop = angular.noop;
describe('$browser', function() {
@@ -8,7 +9,7 @@ describe('ngMock', function() {
it('should store url, done', inject(function($browser) {
var url = 'some.js',
- done = noop;
+ done = angular.noop;
$browser.addJs(url, done);
diff --git a/test/ng/resourceSpec.js b/test/ngResource/resourceSpec.js
index e0049761..3235a6d0 100644
--- a/test/ng/resourceSpec.js
+++ b/test/ngResource/resourceSpec.js
@@ -3,6 +3,7 @@
describe("resource", function() {
var $resource, CreditCard, callback, $httpBackend;
+ beforeEach(module('ngResource'));
beforeEach(inject(function($injector) {
$httpBackend = $injector.get('$httpBackend');
$resource = $injector.get('$resource');
@@ -262,7 +263,7 @@ describe("resource", function() {
$httpBackend.flush();
expect(cc instanceof CreditCard).toBe(true);
- $httpBackend.expect('POST', '/CreditCard/123', toJson(data)).respond('');
+ $httpBackend.expect('POST', '/CreditCard/123', angular.toJson(data)).respond('');
var idBefore = cc.id;
cc.$save();
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index b0618178..a60bc1df 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -8,8 +8,6 @@
*/
_jQuery.event.special.change = undefined;
-
-publishExternalAPI(angular);
bindJQuery();
beforeEach(function() {
publishExternalAPI(angular);