aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/AngularSpec.js21
-rw-r--r--test/ng/locationSpec.js23
2 files changed, 42 insertions, 2 deletions
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index 6384302c..9686ffd6 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -318,10 +318,21 @@ describe('angular', function() {
expect(parseKeyValue('invalid=%')).toEqual({ invalid: undefined });
expect(parseKeyValue('invalid=%&valid=good')).toEqual({ invalid: undefined, valid: 'good' });
});
+ it('should parse a string into key-value pairs with duplicates grouped in an array', function() {
+ expect(parseKeyValue('')).toEqual({});
+ expect(parseKeyValue('duplicate=pair')).toEqual({duplicate: 'pair'});
+ expect(parseKeyValue('first=1&first=2')).toEqual({first: ['1','2']});
+ expect(parseKeyValue('escaped%20key=escaped%20value&&escaped%20key=escaped%20value2')).
+ toEqual({'escaped key': ['escaped value','escaped value2']});
+ expect(parseKeyValue('flag1&key=value&flag1')).
+ toEqual({flag1: [true,true], key: 'value'});
+ expect(parseKeyValue('flag1&flag1=value&flag1=value2&flag1')).
+ toEqual({flag1: [true,'value','value2',true]});
+ });
});
describe('toKeyValue', function() {
- it('should parse key-value pairs into string', function() {
+ it('should serialize key-value pairs into string', function() {
expect(toKeyValue({})).toEqual('');
expect(toKeyValue({simple: 'pair'})).toEqual('simple=pair');
expect(toKeyValue({first: '1', second: '2'})).toEqual('first=1&second=2');
@@ -330,9 +341,15 @@ describe('angular', function() {
expect(toKeyValue({emptyKey: ''})).toEqual('emptyKey=');
});
- it('should parse true values into flags', function() {
+ it('should serialize true values into flags', function() {
expect(toKeyValue({flag1: true, key: 'value', flag2: true})).toEqual('flag1&key=value&flag2');
});
+
+ it('should serialize duplicates into duplicate param strings', function() {
+ expect(toKeyValue({key: [323,'value',true]})).toEqual('key=323&key=value&key');
+ expect(toKeyValue({key: [323,'value',true, 1234]})).
+ toEqual('key=323&key=value&key&key=1234');
+ });
});
diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js
index df8043a3..df826525 100644
--- a/test/ng/locationSpec.js
+++ b/test/ng/locationSpec.js
@@ -368,6 +368,29 @@ describe('$location', function() {
locationUrl.search('q', '1/2 3');
expect(locationUrl.search()).toEqual({'q': '1/2 3'});
});
+
+ it('should return an array for duplicate params', function() {
+ var locationUrl = new LocationHtml5Url('http://host.com');
+ locationUrl.$$parse('http://host.com')
+ locationUrl.search('q', ['1/2 3','4/5 6']);
+ expect(locationUrl.search()).toEqual({'q': ['1/2 3','4/5 6']});
+ });
+
+ it('should encode an array correctly from search and add to url', function() {
+ var locationUrl = new LocationHtml5Url('http://host.com');
+ locationUrl.$$parse('http://host.com')
+ locationUrl.search({'q': ['1/2 3','4/5 6']});
+ expect(locationUrl.absUrl()).toEqual('http://host.com?q=1%2F2%203&q=4%2F5%206');
+ });
+
+ it('should rewrite params when specifing a single param in search', function() {
+ var locationUrl = new LocationHtml5Url('http://host.com');
+ locationUrl.$$parse('http://host.com')
+ locationUrl.search({'q': '1/2 3'});
+ expect(locationUrl.absUrl()).toEqual('http://host.com?q=1%2F2%203');
+ locationUrl.search({'q': '4/5 6'});
+ expect(locationUrl.absUrl()).toEqual('http://host.com?q=4%2F5%206');
+ });
});
});