aboutsummaryrefslogtreecommitdiffstats
path: root/test/ngScenario
diff options
context:
space:
mode:
authorIgor Minar2012-04-12 02:15:36 -0700
committerIgor Minar2012-04-12 02:36:03 -0700
commitdf72852f3496d7640bb4f70837338e464b7ed69f (patch)
tree29ec837b702e97938d3ea2d8a225dbb54a93b003 /test/ngScenario
parentc4f6ccb0658cb723c6e9704cf7fcf1bc72b2ae99 (diff)
downloadangular.js-df72852f3496d7640bb4f70837338e464b7ed69f.tar.bz2
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
Diffstat (limited to 'test/ngScenario')
-rw-r--r--test/ngScenario/dslSpec.js25
1 files changed, 8 insertions, 17 deletions
diff --git a/test/ngScenario/dslSpec.js b/test/ngScenario/dslSpec.js
index fee5c3b5..eef8c907 100644
--- a/test/ngScenario/dslSpec.js
+++ b/test/ngScenario/dslSpec.js
@@ -168,23 +168,14 @@ describe("angular.scenario.dsl", function() {
});
describe('location', function() {
- beforeEach(function() {
- $window.angular.injector = function() {
- 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);
- }
- };
- };
- });
+ beforeEach(inject(function($injector) {
+ angular.extend($injector.get('$location'), {
+ url: function() {return '/path?search=a#hhh';},
+ path: function() {return '/path';},
+ search: function() {return {search: 'a'};},
+ hash: function() {return 'hhh';}
+ });
+ }));
it('should return full url', function() {
$root.dsl.browser().location().url();