Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
fix(scenario.dsl): Fix dsl for $location
Browse files Browse the repository at this point in the history 
New $location does not have hashSearch, hashPath.
The old dsl was mixing $location / window.location so this solves the problem as well...
  • Loading branch information
@vojtajina
vojtajina committed Oct 26, 2011
1 parent d7ba5bc commit dc8ffa5
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 46 deletions.
4 changes: 2 additions & 2 deletions src/markups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ angularTextMarkup('option', function(text, textNode, parentElement){
expect(element('#link-3').attr('href')).toBe("/123");
element('#link-3').click();
expect(browser().location().path()).toEqual('/123');
expect(browser().window().path()).toEqual('/123');
});
it('should execute ng:click but not reload when href empty string and name specified', function() {
Expand All @@ -207,7 +207,7 @@ angularTextMarkup('option', function(text, textNode, parentElement){
expect(element('#link-6').attr('href')).toBe("/6");
element('#link-6').click();
expect(browser().location().path()).toEqual('/6');
expect(browser().window().path()).toEqual('/6');
});
</doc:scenario>
</doc:example>
Expand Down
61 changes: 41 additions & 20 deletions src/scenario/dsl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ angular.scenario.dsl('sleep', function() {
* browser().navigateTo(url) Loads the url into the frame
* browser().navigateTo(url, fn) where fn(url) is called and returns the URL to navigate to
* browser().reload() refresh the page (reload the same URL)
* browser().location().href() the full URL of the page
* browser().location().hash() the full hash in the url
* browser().location().path() the full path in the url
* browser().location().hashSearch() the hashSearch Object from angular
* browser().location().hashPath() the hashPath string from angular
* browser().window.href() window.location.href
* browser().window.path() window.location.pathname
* browser().window.search() window.location.search
* browser().window.hash() window.location.hash without # prefix
* browser().location().url() see angular.service.$location#url
* browser().location().path() see angular.service.$location#path
* browser().location().search() see angular.service.$location#search
* browser().location().hash() see angular.service.$location#hash
*/
angular.scenario.dsl('browser', function() {
var chain = {};
Expand All @@ -65,42 +68,60 @@ angular.scenario.dsl('browser', function() {
});
};

chain.location = function() {
chain.window = function() {
var api = {};

api.href = function() {
return this.addFutureAction('browser url', function($window, $document, done) {
return this.addFutureAction('window.location.href', function($window, $document, done) {
done(null, $window.location.href);
});
};

api.path = function() {
return this.addFutureAction('window.location.path', function($window, $document, done) {
done(null, $window.location.pathname);
});
};

api.search = function() {
return this.addFutureAction('window.location.search', function($window, $document, done) {
done(null, $window.location.search);
});
};

api.hash = function() {
return this.addFutureAction('browser url hash', function($window, $document, done) {
return this.addFutureAction('window.location.hash', function($window, $document, done) {
done(null, $window.location.hash.replace('#', ''));
});
};

api.path = function() {
return this.addFutureAction('browser url path', function($window, $document, done) {
done(null, $window.location.pathname);
return api;
};

chain.location = function() {
var api = {};

api.url = function() {
return this.addFutureAction('$location.url()', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').url());
});
};

api.search = function() {
return this.addFutureAction('browser url search', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').search);
api.path = function() {
return this.addFutureAction('$location.path()', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').path());
});
};

api.hashSearch = function() {
return this.addFutureAction('browser url hash search', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').hashSearch);
api.search = function() {
return this.addFutureAction('$location.search()', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').search());
});
};

api.hashPath = function() {
return this.addFutureAction('browser url hash path', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').hashPath);
api.hash = function() {
return this.addFutureAction('$location.hash()', function($window, $document, done) {
done(null, $window.angular.scope().$service('$location').hash());
});
};

Expand Down
63 changes: 39 additions & 24 deletions test/scenario/dslSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,59 +123,74 @@ describe("angular.scenario.dsl", function() {
});
});

describe('Location', function() {
describe('window', function() {
beforeEach(function() {
$window.location = {
href: 'http://myurl/some/path?foo=10#/bar?x=2',
pathname: '/some/path',
search: '?foo=10',
hash: '#bar?x=2'
};
});

it('should return full URL for href', function() {
$root.dsl.browser().window().href();
expect($root.futureResult).toEqual($window.location.href);
});

it('should return the pathname', function() {
$root.dsl.browser().window().path();
expect($root.futureResult).toEqual($window.location.pathname);
});

it('should return the search part', function() {
$root.dsl.browser().window().search();
expect($root.futureResult).toEqual($window.location.search);
});

it('should return the hash without the #', function() {
$root.dsl.browser().window().hash();
expect($root.futureResult).toEqual('bar?x=2');
});
});

describe('location', function() {
beforeEach(function() {
$window.angular.scope = function() {
return {
$service: function(serviceId) {
if (serviceId == '$location') {
return {
hashSearch: {x: 2},
hashPath: '/bar',
search: {foo: 10}
url: function() {return '/path?search=a#hhh';},
path: function() {return '/path';},
search: function() {return {search: 'a'};},
hash: function() {return 'hhh';}
};
} else {
throw new Error('unknown service id ' + serviceId);
}
throw new Error('unknown service id ' + serviceId);
}
};
};
});

it('should return full URL for href', function() {
$root.dsl.browser().location().href();
expect($root.futureResult).toEqual($window.location.href);
it('should return full url', function() {
$root.dsl.browser().location().url();
expect($root.futureResult).toEqual('/path?search=a#hhh');
});

it('should return the pathname', function() {
$root.dsl.browser().location().path();
expect($root.futureResult).toEqual($window.location.pathname);
});

it('should return the hash without the #', function() {
$root.dsl.browser().location().hash();
expect($root.futureResult).toEqual('bar?x=2');
expect($root.futureResult).toEqual('/path');
});

it('should return the query string as an object', function() {
$root.dsl.browser().location().search();
expect($root.futureResult).toEqual({foo: 10});
expect($root.futureResult).toEqual({search: 'a'});
});

it('should return the hashSearch as an object', function() {
$root.dsl.browser().location().hashSearch();
expect($root.futureResult).toEqual({x: 2});
});

it('should return the hashPath', function() {
$root.dsl.browser().location().hashPath();
expect($root.futureResult).toEqual('/bar');
it('should return the hash without the #', function() {
$root.dsl.browser().location().hash();
expect($root.futureResult).toEqual('hhh');
});
});
});
Expand Down

0 comments on commit dc8ffa5

Please sign in to comment.