aboutsummaryrefslogtreecommitdiffstats
path: root/src/scenario
diff options
context:
space:
mode:
Diffstat (limited to 'src/scenario')
-rw-r--r--src/scenario/Application.js2
-rw-r--r--src/scenario/Runner.js2
-rw-r--r--src/scenario/dsl.js8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/scenario/Application.js b/src/scenario/Application.js
index f4f4b974..5e7b8370 100644
--- a/src/scenario/Application.js
+++ b/src/scenario/Application.js
@@ -92,7 +92,7 @@ angular.scenario.Application.prototype.executeAction = function(action) {
}
var element = $window.angular.element($window.document);
var $injector = element.inheritedData('$injector');
- $injector(function($browser){
+ $injector.invoke(null, function($browser){
$browser.notifyWhenNoOutstandingRequests(function() {
action.call(self, $window, _jQuery($window.document));
});
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 5839fae0..aeb5196a 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -163,7 +163,7 @@ angular.scenario.Runner.prototype.createSpecRunner_ = function(scope) {
*/
angular.scenario.Runner.prototype.run = function(application) {
var self = this;
- var $root = angular.injector('ng')('$rootScope');
+ var $root = angular.injector('ng').get('$rootScope');
angular.extend($root, this);
angular.forEach(angular.scenario.Runner.prototype, function(fn, name) {
$root[name] = angular.bind(self, fn);
diff --git a/src/scenario/dsl.js b/src/scenario/dsl.js
index 8963f889..12cbdb21 100644
--- a/src/scenario/dsl.js
+++ b/src/scenario/dsl.js
@@ -103,25 +103,25 @@ angular.scenario.dsl('browser', function() {
api.url = function() {
return this.addFutureAction('$location.url()', function($window, $document, done) {
- done(null, $window.angular.injector('ng')('$location').url());
+ done(null, $window.angular.injector('ng').get('$location').url());
});
};
api.path = function() {
return this.addFutureAction('$location.path()', function($window, $document, done) {
- done(null, $window.angular.injector('ng')('$location').path());
+ done(null, $window.angular.injector('ng').get('$location').path());
});
};
api.search = function() {
return this.addFutureAction('$location.search()', function($window, $document, done) {
- done(null, $window.angular.injector('ng')('$location').search());
+ done(null, $window.angular.injector('ng').get('$location').search());
});
};
api.hash = function() {
return this.addFutureAction('$location.hash()', function($window, $document, done) {
- done(null, $window.angular.injector('ng')('$location').hash());
+ done(null, $window.angular.injector('ng').get('$location').hash());
});
};