Merge pull request #3 from rjacobsen2012/add-content-type-header

Add content type header
Indatus · Apr 7, 2014 · 76e9b28 · 76e9b28
2 parents fe2a1f4 + 886a5aa
commit 76e9b28
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 17 deletions.
diff --git a/src/Trucker/Transporters/JsonTransporter.php b/src/Trucker/Transporters/JsonTransporter.php
@@ -16,12 +16,15 @@ class JsonTransporter implements TransporterInterface
     /**
      * Function to set the appropriate headers on a request object
      * to facilitate a JSON transport
-     * 
+     *
      * @param GuzzleHttpMessageRequest $request
      */
     public function setHeaderOnRequest(\Guzzle\Http\Message\Request &$request)
     {
-        $request->setHeader('Accept', 'application/json');
+        $request->setHeaders([
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/json'
+        ]);
     }
 
     /**

diff --git a/tests/Requests/RestRequestTest.php b/tests/Requests/RestRequestTest.php
@@ -29,7 +29,13 @@ public function testGetOption()
     public function testSetTransportLanguage()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
         ]);
 
         $r = $request->createRequest('http://example.com', '/users', 'GET');
@@ -40,7 +46,13 @@ public function testSetTransportLanguage()
     public function testCreateNewRequest()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
         ]);
         $result = $request->createRequest('http://example.com', '/users', 'GET');
         $this->assertTrue($result instanceof \Guzzle\Http\Message\Request);
@@ -51,7 +63,13 @@ public function testCreateNewRequest()
     public function testSetPostParameters()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'setPostField', 'args' => ['biz', 'banng']],
         ]);
 
@@ -67,7 +85,13 @@ public function testSetGetParameters()
         $mQuery->shouldReceive('add')->with('foo', 'bar');
 
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'getQuery', 'return' => $mQuery],
         ]);
 
@@ -80,7 +104,13 @@ public function testSetGetParameters()
     public function testSetFileParameters()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'addPostFile', 'args' => ['fileOne', '/path/to/fileOne']],
         ]);
 
@@ -93,7 +123,13 @@ public function testSetFileParameters()
     public function testSettingModelProperties()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'setPostField', 'args' => ['foo', 'bar']],
             ['method' => 'setPostField', 'args' => ['biz', 'bang']],
             ['method' => 'addPostFile', 'args' => ['fOne', '/path/to/file/one']],
@@ -123,7 +159,13 @@ public function testSettingModelProperties()
     public function testSettingHeaders()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'setHeader', 'args' => ['Cache-Control', 'no-cache, must-revalidate']],
         ]);
 
@@ -139,7 +181,13 @@ public function testAddingErrorHandler()
         $dispatcher->shouldReceive('addListener');
 
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'getEventDispatcher', 'return' => $dispatcher],
         ]);
 
@@ -156,7 +204,13 @@ public function testAddingErrorHandler()
     public function testAddQueryCondition()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
         ]);
         $r = $request->createRequest('http://example.com', '/users', 'GET');
 
@@ -171,7 +225,13 @@ public function testAddQueryCondition()
     public function testAddQueryResultOrder()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
         ]);
         $r = $request->createRequest('http://example.com', '/users', 'GET');
 
@@ -186,7 +246,13 @@ public function testAddQueryResultOrder()
     public function testAddAuthentication()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
         ]);
         $r = $request->createRequest('http://example.com', '/users', 'GET');
 
@@ -201,7 +267,13 @@ public function testAddAuthentication()
     public function testSendRequest()
     {
         $request = $this->simpleMockRequest([
-            ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+            [
+                'method' => 'setHeaders',
+                'args' => [[
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+                ]]
+            ],
             ['method' => 'send', 'return' => m::mock('Guzzle\Http\Message\Response')],
         ]);
 
@@ -215,7 +287,13 @@ public function testHttpMethodParam()
     {
         $request = $this->simpleMockRequest(
             [
-                ['method' => 'setHeader', 'args' => ['Accept', 'application/json']],
+                [
+                    'method' => 'setHeaders',
+                    'args' => [[
+                        'Accept' => 'application/json',
+                        'Content-Type' => 'application/json'
+                    ]]
+                ],
                 ['method' => 'setPostField', 'args' => ['_method', 'PUT']],
             ],
             'http://example.com',

diff --git a/tests/Transporters/JsonTransporterTest.php b/tests/Transporters/JsonTransporterTest.php
@@ -9,8 +9,11 @@ class JsonTransporterTest extends TruckerTests
     public function testSetsHeaderOnRequest()
     {
         $request = m::mock('Guzzle\Http\Message\Request');
-        $request->shouldReceive('setHeader')
-            ->with('Accept', 'application/json')
+        $request->shouldReceive('setHeaders')
+            ->with([
+                'Accept' => 'application/json',
+                'Content-Type' => 'application/json'
+            ])
             ->once();
 
         $transporter = new JsonTransporter;