aboutsummaryrefslogtreecommitdiffstats
path: root/test/service/routeParamsSpec.js
diff options
context:
space:
mode:
authorMisko Hevery2011-10-17 16:56:56 -0700
committerMisko Hevery2011-11-14 16:39:31 -0800
commit48697a2b86dbb12ea8de64cc5fece7caf68b321e (patch)
tree1fa50659f0bb5de2640dea2a2e5bb5628f2bb14a /test/service/routeParamsSpec.js
parent93b777c916ccff243c5a6080bf5f39860ac7bf39 (diff)
downloadangular.js-48697a2b86dbb12ea8de64cc5fece7caf68b321e.tar.bz2
refactor(injector): turn scope into a service
- turn scope into a $rootScope service. - injector is now a starting point for creating angular application. - added inject() method which wraps jasmine its/beforeEach/afterEach, and which allows configuration and injection of services. - refactor tests to use inject() where possible BREAK: - removed angular.scope() method
Diffstat (limited to 'test/service/routeParamsSpec.js')
-rw-r--r--test/service/routeParamsSpec.js33
1 files changed, 4 insertions, 29 deletions
diff --git a/test/service/routeParamsSpec.js b/test/service/routeParamsSpec.js
index 972e4314..d4088767 100644
--- a/test/service/routeParamsSpec.js
+++ b/test/service/routeParamsSpec.js
@@ -1,41 +1,16 @@
'use strict';
describe('$routeParams', function() {
- it('should publish the params into a service', function() {
- var scope = angular.scope(),
- $location = scope.$service('$location'),
- $route = scope.$service('$route'),
- $routeParams = scope.$service('$routeParams');
-
+ it('should publish the params into a service', inject(function($rootScope, $route, $location, $routeParams) {
$route.when('/foo');
$route.when('/bar/:barId');
$location.path('/foo').search('a=b');
- scope.$digest();
+ $rootScope.$digest();
expect($routeParams).toEqual({a:'b'});
$location.path('/bar/123').search('x=abc');
- scope.$digest();
+ $rootScope.$digest();
expect($routeParams).toEqual({barId:'123', x:'abc'});
- });
-
-
- it('should preserve object identity during route reloads', function() {
- var scope = angular.scope(),
- $location = scope.$service('$location'),
- $route = scope.$service('$route'),
- $routeParams = scope.$service('$routeParams'),
- firstRouteParams = $routeParams;
-
- $route.when('/foo');
- $route.when('/bar/:barId');
-
- $location.path('/foo').search('a=b');
- scope.$digest();
- expect(scope.$service('$routeParams')).toBe(firstRouteParams);
-
- $location.path('/bar/123').search('x=abc');
- scope.$digest();
- expect(scope.$service('$routeParams')).toBe(firstRouteParams);
- });
+ }));
});