fix(XhrBackend): setRequestHeader takes a string arg

vicb · vicb · commit 6b00b604887d · 2015-10-08T15:59:10.000Z
Closes #4597
diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts
@@ -64,7 +64,7 @@ export class XHRConnection implements Connection {
       };
 
       if (isPresent(req.headers)) {
-        req.headers.forEach((value, name) => { _xhr.setRequestHeader(name, value); });
+        req.headers.forEach((values, name) => { _xhr.setRequestHeader(name, values.join(',')); });
       }
 
       _xhr.addEventListener('load', onLoad);
diff --git a/modules/angular2/src/http/headers.ts b/modules/angular2/src/http/headers.ts
@@ -70,7 +70,7 @@ export class Headers {
    */
   delete (name: string): void { MapWrapper.delete(this._headersMap, name); }
 
-  forEach(fn: (value: string, name: string, headers: Headers) => any): void {
+  forEach(fn: (values: string[], name: string, headers: Map<string, string[]>) => void): void {
     MapWrapper.forEach(this._headersMap, fn);
   }
 
diff --git a/modules/angular2/test/http/backends/xhr_backend_spec.ts b/modules/angular2/test/http/backends/xhr_backend_spec.ts
@@ -148,14 +148,16 @@ export function main() {
       });
 
       it('should attach headers to the request', () => {
-        var headers = new Headers({'Content-Type': 'text/xml', 'Breaking-Bad': '<3'});
+        var headers =
+            new Headers({'Content-Type': 'text/xml', 'Breaking-Bad': '<3', 'X-Multi': ['a', 'b']});
 
         var base = new BaseRequestOptions();
         var connection = new XHRConnection(
             new Request(base.merge(new RequestOptions({headers: headers}))), new MockBrowserXHR());
         connection.response.subscribe();
-        expect(setRequestHeaderSpy).toHaveBeenCalledWith('Content-Type', ['text/xml']);
-        expect(setRequestHeaderSpy).toHaveBeenCalledWith('Breaking-Bad', ['<3']);
+        expect(setRequestHeaderSpy).toHaveBeenCalledWith('Content-Type', 'text/xml');
+        expect(setRequestHeaderSpy).toHaveBeenCalledWith('Breaking-Bad', '<3');
+        expect(setRequestHeaderSpy).toHaveBeenCalledWith('X-Multi', 'a,b');
       });
 
       it('should return the correct status code', inject([AsyncTestCompleter], async => {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class XHRConnection implements Connection {`
`64`	`64`	`};`
`65`	`65`
`66`	`66`	`if (isPresent(req.headers)) {`
`67`		`- req.headers.forEach((value, name) => { _xhr.setRequestHeader(name, value); });`
	`67`	`+ req.headers.forEach((values, name) => { _xhr.setRequestHeader(name, values.join(',')); });`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`_xhr.addEventListener('load', onLoad);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class Headers {`
`70`	`70`	`*/`
`71`	`71`	`delete (name: string): void { MapWrapper.delete(this._headersMap, name); }`
`72`	`72`
`73`		`- forEach(fn: (value: string, name: string, headers: Headers) => any): void {`
	`73`	`+ forEach(fn: (values: string[], name: string, headers: Map<string, string[]>) => void): void {`
`74`	`74`	`MapWrapper.forEach(this._headersMap, fn);`
`75`	`75`	`}`
`76`	`76`