From df72852f3496d7640bb4f70837338e464b7ed69f Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Thu, 12 Apr 2012 02:15:36 -0700
Subject: fix(e2eRunner): $browser.location should delegate to apps $location

previously it would create a new instance which wasn't configured as the one in the app,
which resulted in incorrect values being returned in html5 mode with base url set
---
 src/ngScenario/Application.js | 3 +--
 src/ngScenario/dsl.js         | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js
index d3a70569..1fdf3eb8 100644
--- a/src/ngScenario/Application.js
+++ b/src/ngScenario/Application.js
@@ -91,8 +91,7 @@ angular.scenario.Application.prototype.executeAction = function(action) {
     return action.call(this, $window, _jQuery($window.document));
   }
   angularInit($window.document, function(element) {
-    element = $window.angular.element(element);
-    var $injector = element.inheritedData('$injector');
+    var $injector = $window.angular.element(element).injector();
     $injector.invoke(function($browser){
       $browser.notifyWhenNoOutstandingRequests(function() {
         action.call(self, $window, _jQuery($window.document));
diff --git a/src/ngScenario/dsl.js b/src/ngScenario/dsl.js
index 7ca33a26..6f3a3c73 100644
--- a/src/ngScenario/dsl.js
+++ b/src/ngScenario/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']).get('$location').url());
+        done(null, $window.angular.element($window.document).injector().get('$location').url());
       });
     };
 
     api.path = function() {
       return this.addFutureAction('$location.path()', function($window, $document, done) {
-        done(null, $window.angular.injector(['ng']).get('$location').path());
+        done(null, $window.angular.element($window.document).injector().get('$location').path());
       });
     };
 
     api.search = function() {
       return this.addFutureAction('$location.search()', function($window, $document, done) {
-        done(null, $window.angular.injector(['ng']).get('$location').search());
+        done(null, $window.angular.element($window.document).injector().get('$location').search());
       });
     };
 
     api.hash = function() {
       return this.addFutureAction('$location.hash()', function($window, $document, done) {
-        done(null, $window.angular.injector(['ng']).get('$location').hash());
+        done(null, $window.angular.element($window.document).injector().get('$location').hash());
       });
     };
 
-- 
cgit v1.2.3