@@ -6,12 +6,12 @@ import { StateRegistry } from "../src/state/stateRegistry";
6
6
import { noop } from "../src/common/common" ;
7
7
import { UrlRule , MatchResult } from "../src/url/interface" ;
8
8
9
- declare var jasmine ;
10
- var _anything = jasmine . anything ( ) ;
9
+ declare let jasmine ;
10
+ let _anything = jasmine . anything ( ) ;
11
11
12
12
describe ( "UrlRouter" , function ( ) {
13
- var router : UIRouter ;
14
- var urlRouter : UrlRouter ,
13
+ let router : UIRouter ;
14
+ let urlRouter : UrlRouter ,
15
15
urlService : UrlService ,
16
16
urlMatcherFactory : UrlMatcherFactory ,
17
17
stateService : StateService ,
@@ -62,8 +62,8 @@ describe("UrlRouter", function () {
62
62
} ) ;
63
63
64
64
it ( '`rule` should return a deregistration function' , function ( ) {
65
- var count = 0 ;
66
- var rule : UrlRule = {
65
+ let count = 0 ;
66
+ let rule : UrlRule = {
67
67
match : ( ) => count ++ ,
68
68
handler : match => match ,
69
69
matchPriority : ( ) => 0 ,
@@ -85,8 +85,8 @@ describe("UrlRouter", function () {
85
85
} ) ;
86
86
87
87
it ( '`removeRule` should remove a previously registered rule' , function ( ) {
88
- var count = 0 ;
89
- var rule : UrlRule = {
88
+ let count = 0 ;
89
+ let rule : UrlRule = {
90
90
match : ( ) => count ++ ,
91
91
handler : match => match ,
92
92
matchPriority : ( ) => 0 ,
@@ -161,7 +161,7 @@ describe("UrlRouter", function () {
161
161
describe ( "URL generation" , function ( ) {
162
162
it ( "should return null when UrlMatcher rejects parameters" , function ( ) {
163
163
urlMatcherFactory . type ( "custom" , < any > { is : val => val === 1138 } ) ;
164
- var urlmatcher = matcher ( "/foo/{param:custom}" ) ;
164
+ let urlmatcher = matcher ( "/foo/{param:custom}" ) ;
165
165
166
166
expect ( urlRouter . href ( urlmatcher , { param : 1138 } ) ) . toBe ( '#/foo/1138' ) ;
167
167
expect ( urlRouter . href ( urlmatcher , { param : 5 } ) ) . toBeNull ( ) ;
@@ -174,12 +174,12 @@ describe("UrlRouter", function () {
174
174
175
175
describe ( 'Url Rule priority' , ( ) => {
176
176
177
- var matchlog : string [ ] ;
177
+ let matchlog : string [ ] ;
178
178
beforeEach ( ( ) => matchlog = [ ] ) ;
179
179
const log = ( id ) => ( ) => ( matchlog . push ( id ) , null ) ;
180
180
181
181
it ( "should prioritize a path with a static string over a param 1" , ( ) => {
182
- var spy = spyOn ( stateService , "transitionTo" ) ;
182
+ let spy = spyOn ( stateService , "transitionTo" ) ;
183
183
let A = stateRegistry . register ( { name : 'A' , url : '/:pA' } ) ;
184
184
let B = stateRegistry . register ( { name : 'B' , url : '/BBB' } ) ;
185
185
@@ -191,7 +191,7 @@ describe("UrlRouter", function () {
191
191
} ) ;
192
192
193
193
it ( "should prioritize a path with a static string over a param 2" , ( ) => {
194
- var spy = spyOn ( stateService , "transitionTo" ) ;
194
+ let spy = spyOn ( stateService , "transitionTo" ) ;
195
195
stateRegistry . register ( { name : 'foo' , url : '/foo' } ) ;
196
196
let A = stateRegistry . register ( { name : 'foo.A' , url : '/:pA' } ) ;
197
197
let B = stateRegistry . register ( { name : 'B' , url : '/foo/BBB' } ) ;
@@ -269,7 +269,7 @@ describe("UrlRouter", function () {
269
269
270
270
urlService . url ( "/foo/123/456?query=blah" ) ;
271
271
expect ( matchlog ) . toEqual ( [ 1 , 2 ] ) ;
272
- } )
272
+ } ) ;
273
273
} ) ;
274
274
} ) ;
275
275
@@ -284,7 +284,7 @@ describe("UrlRouter", function () {
284
284
it ( "should return the best match for a URL 1" , ( ) => {
285
285
let match : MatchResult = urlRouter . match ( { path : '/BBB' } ) ;
286
286
expect ( match . rule . type ) . toBe ( "STATE" ) ;
287
- expect ( match . rule [ 'state' ] ) . toBe ( B )
287
+ expect ( match . rule [ 'state' ] ) . toBe ( B ) ;
288
288
} ) ;
289
289
290
290
it ( "should return the best match for a URL 2" , ( ) => {
@@ -312,7 +312,7 @@ describe("UrlRouter", function () {
312
312
} ;
313
313
314
314
registry . register ( { name : 'lazy.**' , url : '/lazy' , lazyLoad : lazyLoad } ) ;
315
- registry . register ( { name : 'param' , url : '/:param' , } ) ;
315
+ registry . register ( { name : 'param' , url : '/:param' } ) ;
316
316
317
317
router . transitionService . onSuccess ( { } , trans => {
318
318
expect ( trans . $to ( ) ) . toBe ( loadedState ) ;
@@ -322,22 +322,22 @@ describe("UrlRouter", function () {
322
322
} ) ;
323
323
324
324
router . urlService . url ( '/lazy' ) ;
325
- } )
326
- } )
325
+ } ) ;
326
+ } ) ;
327
327
} ) ;
328
328
329
329
describe ( 'UrlRouter.deferIntercept' , ( ) => {
330
- var $ur , $url ;
330
+ let $ur , $url ;
331
331
beforeEach ( function ( ) {
332
- var router = new UIRouter ( ) ;
332
+ let router = new UIRouter ( ) ;
333
333
router . urlRouter . deferIntercept ( ) ;
334
334
router . plugin ( TestingPlugin ) ;
335
335
$ur = router . urlRouter ;
336
336
$url = router . urlService ;
337
337
} ) ;
338
338
339
339
it ( "should allow location changes to be deferred" , function ( ) {
340
- var log = [ ] ;
340
+ let log = [ ] ;
341
341
342
342
$ur . rule ( $ur . urlRuleFactory . create ( / .* / , ( ) => log . push ( $url . path ( ) ) ) ) ;
343
343
0 commit comments