@@ -236,7 +236,8 @@ describe("UrlMatcher", function () {
236
236
$location . url ( "/foo?param1=bar" ) ;
237
237
expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : 'bar' } ) ; // auto unwrap
238
238
$location . url ( "/foo?param1=bar¶m1=baz" ) ;
239
- expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : [ 'bar' , 'baz' ] } ) ;
239
+ if ( angular . isArray ( $location . search ( ) ) ) // conditional for angular 1.0.8
240
+ expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : [ 'bar' , 'baz' ] } ) ;
240
241
241
242
expect ( m . format ( { } ) ) . toBe ( "/foo" ) ;
242
243
expect ( m . format ( { param1 : undefined } ) ) . toBe ( "/foo" ) ;
@@ -269,7 +270,8 @@ describe("UrlMatcher", function () {
269
270
$location . url ( "/foo?param1=bar" ) ;
270
271
expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : [ 'bar' ] } ) ;
271
272
$location . url ( "/foo?param1=bar¶m1=baz" ) ;
272
- expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : [ 'bar' , 'baz' ] } ) ;
273
+ if ( angular . isArray ( $location . search ( ) ) ) // conditional for angular 1.0.8
274
+ expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : [ 'bar' , 'baz' ] } ) ;
273
275
274
276
expect ( m . format ( { } ) ) . toBe ( "/foo" ) ;
275
277
expect ( m . format ( { param1 : undefined } ) ) . toBe ( "/foo" ) ;
@@ -290,7 +292,8 @@ describe("UrlMatcher", function () {
290
292
expect ( m . format ( { "param1[]" : [ 'bar' ] } ) ) . toBe ( "/foo?param1[]=bar" ) ;
291
293
292
294
$location . url ( "/foo?param1[]=bar¶m1[]=baz" ) ;
293
- expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { "param1[]" : [ 'bar' , 'baz' ] } ) ;
295
+ if ( angular . isArray ( $location . search ( ) ) ) // conditional for angular 1.0.8
296
+ expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { "param1[]" : [ 'bar' , 'baz' ] } ) ;
294
297
expect ( m . format ( { "param1[]" : [ 'bar' , 'baz' ] } ) ) . toBe ( "/foo?param1[]=bar¶m1[]=baz" ) ;
295
298
} ) ) ;
296
299
@@ -305,7 +308,8 @@ describe("UrlMatcher", function () {
305
308
expect ( m . format ( { param1 : [ 'bar' ] } ) ) . toBe ( "/foo?param1=bar" ) ;
306
309
307
310
$location . url ( "/foo?param1=bar¶m1=baz" ) ;
308
- expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : 'bar,baz' } ) ; // coerced to string
311
+ if ( angular . isArray ( $location . search ( ) ) ) // conditional for angular 1.0.8
312
+ expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { param1 : 'bar,baz' } ) ; // coerced to string
309
313
expect ( m . format ( { param1 : [ 'bar' , 'baz' ] } ) ) . toBe ( "/foo?param1=bar%2Cbaz" ) ; // coerced to string
310
314
} ) ) ;
311
315
} ) ;
@@ -501,7 +505,8 @@ describe("urlMatcherFactory", function () {
501
505
expect ( m . format ( { fooid : 5 , bar : 1 } ) ) . toEqual ( "/foo/5?bar=1" ) ;
502
506
503
507
$location . url ( "/foo/5?bar=1&bar=2&bar=3" ) ;
504
- expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { fooid : 5 , bar : [ 1 , 2 , 3 ] } ) ;
508
+ if ( angular . isArray ( $location . search ( ) ) ) // conditional for angular 1.0.8
509
+ expect ( m . exec ( $location . path ( ) , $location . search ( ) ) ) . toEqual ( { fooid : 5 , bar : [ 1 , 2 , 3 ] } ) ;
505
510
expect ( m . format ( { fooid : 5 , bar : [ 1 , 2 , 3 ] } ) ) . toEqual ( "/foo/5?bar=1&bar=2&bar=3" ) ;
506
511
507
512
m . format ( )
0 commit comments