From a6115018d24387796b59f7f31885589008872589 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Thu, 14 Apr 2016 12:06:43 -0400 Subject: [PATCH] Add x-www-form-urlencoded header for XhrHttpImpl It might be the case that we may want to post raw data in the future; in fact, I can guarantee it. We'll cross that bridge when we come to it. * src/dapi/http/XhrHttpImpl.js (openRequest): Set ContentType header on POST * test/dapi/http/XhrHttpImplTest.js: Modified accordingly --- src/dapi/http/XhrHttpImpl.js | 8 +++++ test/dapi/http/XhrHttpImplTest.js | 54 ++++++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/src/dapi/http/XhrHttpImpl.js b/src/dapi/http/XhrHttpImpl.js index 622b5c7..710d649 100644 --- a/src/dapi/http/XhrHttpImpl.js +++ b/src/dapi/http/XhrHttpImpl.js @@ -177,6 +177,14 @@ module.exports = Class( 'XhrHttpImpl' ) { // alway async req.open( method, url, true ); + + if ( method === 'POST' ) + { + req.setRequestHeader( + 'Content-Type', + 'application/x-www-form-urlencoded' + ); + } }, diff --git a/test/dapi/http/XhrHttpImplTest.js b/test/dapi/http/XhrHttpImplTest.js index ffa5ca2..93df02e 100644 --- a/test/dapi/http/XhrHttpImplTest.js +++ b/test/dapi/http/XhrHttpImplTest.js @@ -170,34 +170,79 @@ describe( 'XhrHttpImpl', function() .requestData( url, 'GET', "", done ); } ); + + it( 'does not set Content-Type', function( done ) + { + var url = 'http://bar', + StubXhr = createStubXhr(); + + StubXhr.prototype.readyState = 4; // done + StubXhr.prototype.status = 200; // OK + + StubXhr.prototype.setRequestHeader = function() + { + // warning: this is fragile, if additional headers are + // ever set + throw Error( 'Headers should not be set on GET' ); + }; + + Sut( StubXhr ) + .requestData( url, 'GET', "", done ); + } ); } ); describe( 'HTTP method is not GET', function() { - it( 'sends data verbatim', function( done ) + it( 'sends data verbatim as x-www-form-urlencoded', function( done ) { var url = 'http://bar', src = "moocow", - StubXhr = createStubXhr(); + StubXhr = createStubXhr(), + + open_called = false, + send_called = false, + header_called = false; StubXhr.prototype.readyState = 4; // done StubXhr.prototype.status = 200; // OK StubXhr.prototype.open = function( _, given_url ) { + open_called = true; + // URL should be unchanged expect( given_url ).to.equal( url ); }; StubXhr.prototype.send = function( data ) { + send_called = true; + expect( data ).is.equal( src ); StubXhr.inst.onreadystatechange(); }; + StubXhr.prototype.setRequestHeader = function( name, val ) + { + header_called = true; + + // warning: this is fragile, if additional headers are + // ever set + expect( name ).to.equal( 'Content-Type' ); + expect( val ).to.equal( + 'application/x-www-form-urlencoded' + ); + }; + Sut( StubXhr ) - .requestData( url, 'POST', src, done ); + .requestData( url, 'POST', src, function() + { + console.log( open_called, send_called, header_called ); + expect( open_called && send_called && header_called ) + .to.be.true; + done(); + } ); } ); } ); @@ -346,7 +391,8 @@ function createStubXhr() send: function( data ) { this.onreadystatechange(); - } + }, + setRequestHeader: function() {}, }; return StubXhr;