aboutsummaryrefslogtreecommitdiffstats
path: root/test/scenario/dslSpec.js
diff options
context:
space:
mode:
authorMisko Hevery2011-11-12 15:23:30 -0800
committerMisko Hevery2011-11-14 20:31:19 -0800
commite88dfb734a64aad4dbd402642816781b0e1725ec (patch)
tree19fb3dde697d1dc3082be9550c76aa29a8c232a7 /test/scenario/dslSpec.js
parent8d6dc0b9a7b3dbff5f8edb3217b60b0cc5b66be4 (diff)
downloadangular.js-e88dfb734a64aad4dbd402642816781b0e1725ec.tar.bz2
refactor(injector): $injector is no longer a function.
- $injector('abc') -> $injector.get('abc'); - $injector(fn) -> $injector.invoke(null, fn);
Diffstat (limited to 'test/scenario/dslSpec.js')
-rw-r--r--test/scenario/dslSpec.js22
1 files changed, 12 insertions, 10 deletions
diff --git a/test/scenario/dslSpec.js b/test/scenario/dslSpec.js
index 29956801..1b0d613c 100644
--- a/test/scenario/dslSpec.js
+++ b/test/scenario/dslSpec.js
@@ -11,7 +11,7 @@ describe("angular.scenario.dsl", function() {
angular: new angular.scenario.testing.MockAngular()
};
$window.document.data('$injector', $injector);
- $root = $injector('$rootScope');
+ $root = $injector.get('$rootScope');
$root.emit = function(eventName) {
eventLog.push(eventName);
};
@@ -162,16 +162,18 @@ describe("angular.scenario.dsl", function() {
describe('location', function() {
beforeEach(function() {
$window.angular.injector = function() {
- return function(serviceId) {
- if (serviceId == '$location') {
- return {
- url: function() {return '/path?search=a#hhh';},
- path: function() {return '/path';},
- search: function() {return {search: 'a'};},
- hash: function() {return 'hhh';}
- };
+ return {
+ get: function(serviceId) {
+ if (serviceId == '$location') {
+ return {
+ url: function() {return '/path?search=a#hhh';},
+ path: function() {return '/path';},
+ search: function() {return {search: 'a'};},
+ hash: function() {return 'hhh';}
+ };
+ }
+ throw new Error('unknown service id ' + serviceId);
}
- throw new Error('unknown service id ' + serviceId);
};
};
});