aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMisko Hevery2012-09-11 22:10:26 -0700
committerMisko Hevery2012-09-11 23:16:41 -0700
commit074a354fa975203f2043df28a92c4a8659ef81d0 (patch)
treefc5008b24a6455f12564773d61e8363fe6438cde /test
parente191582a02196e38d00236dd432748572bd30682 (diff)
downloadangular.js-074a354fa975203f2043df28a92c4a8659ef81d0.tar.bz2
fix($route): support inline annotation on .resolve
Diffstat (limited to 'test')
-rw-r--r--test/ng/routeSpec.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ng/routeSpec.js b/test/ng/routeSpec.js
index 31d932f7..0e98be5f 100644
--- a/test/ng/routeSpec.js
+++ b/test/ng/routeSpec.js
@@ -232,10 +232,10 @@ describe('$route', function() {
return deferB.promise;
});
$routeProvider.when('/path', { templateUrl: 'foo.html', resolve: {
- a: function($q) {
+ a: ['$q', function($q) {
deferA = $q.defer();
return deferA.promise;
- },
+ }],
b: 'b'
} });
});
@@ -434,8 +434,8 @@ describe('$route', function() {
});
});
});
-
-
+
+
it('should match route with and without trailing slash', function() {
module(function($routeProvider){
$routeProvider.when('/foo', {templateUrl: 'foo.html'});