kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-24 03:55:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(scenario.dsl): Fix dsl for $location

Browse Source 
New $location does not have hashSearch, hashPath.
The old dsl was mixing $location / window.location so this solves the problem as well...
This commit is contained in:
Vojta Jina
2011-10-24 15:22:34 -07:00
parent d7ba5bc83b
commit dc8ffa51b7
3 changed files with 84 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
test/scenario/dslSpec.js
View File

@@ -123,7 +123,7 @@ 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',
@@ -131,51 +131,66 @@ describe("angular.scenario.dsl", function() {
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');
});
});
});