Merge pull request #56 from Codeception/delete-sends-body

DELETE method sends request body

Author: Naktibalda

src/Codeception/Module/REST.php

@@ -83,7 +83,7 @@
  */
 class REST extends CodeceptionModule implements DependsOnModule, PartedModule, API, ConflictsWithModule
 {
-    const QUERY_PARAMS_AWARE_METHODS = ['GET', 'HEAD', 'DELETE', 'OPTIONS'];
+    const QUERY_PARAMS_AWARE_METHODS = ['GET', 'HEAD', 'OPTIONS'];
 
     protected $config = [
         'url' => '',

tests/unit/Codeception/Module/RestTest.php

@@ -213,12 +213,49 @@ public function testApplicationJsonIncludesObjectSerialized()
         $this->assertJson($request->getContent());
     }
 
+    /**
+     * @param string $method
+     *
+     * @dataProvider requestBodyAwareMethods
+     */
+    public function testRequestBodyIsSentAsJsonForThisMethod($method)
+    {
+        $this->module->haveHttpHeader('Content-Type', 'application/json');
+        $this->module->send($method, '/', ['name' => 'john']);
+        /** @var $request \Symfony\Component\BrowserKit\Request  **/
+        $request = $this->module->client->getRequest();
+        $this->assertSame(json_encode(['name' => 'john']), $request->getContent());
+    }
+
+    /**
+     * @param string $method
+     *
+     * @dataProvider requestBodyAwareMethods
+     */
+    public function testRequestBodyIsSentUrlEncodedForThisMethod($method)
+    {
+        $this->module->send($method, '/', ['name' => 'john']);
+        /** @var $request \Symfony\Component\BrowserKit\Request  **/
+        $request = $this->module->client->getRequest();
+        $this->assertSame(http_build_query(['name' => 'john']), $request->getContent());
+    }
+
+    public function requestBodyAwareMethods()
+    {
+        return [
+            'POST'   => ['POST'],
+            'PUT'    => ['PUT'],
+            'PATCH'  => ['PATCH'],
+            'DELETE' => ['DELETE'],
+        ];
+    }
+
     /**
      * @param string $method
      *
      * @dataProvider queryParamsAwareMethods
      */
-    public function testGetApplicationJsonNotIncludesJsonAsContent($method)
+    public function testJsonRequestBodyIsNotSentForThisMethod($method)
     {
         $this->module->haveHttpHeader('Content-Type', 'application/json');
         $this->module->send($method, '/', ['name' => 'john']);
@@ -228,12 +265,26 @@ public function testGetApplicationJsonNotIncludesJsonAsContent($method)
         $this->assertContains('john', $request->getParameters());
     }
 
+
+    /**
+     * @param string $method
+     *
+     * @dataProvider queryParamsAwareMethods
+     */
+    public function testUrlEncodedRequestBodyIsNotSentForThisMethod($method)
+    {
+        $this->module->send($method, '/', ['name' => 'john']);
+        /** @var $request \Symfony\Component\BrowserKit\Request  **/
+        $request = $this->module->client->getRequest();
+        $this->assertNull($request->getContent());
+        $this->assertContains('john', $request->getParameters());
+    }
+
     public function queryParamsAwareMethods()
     {
         return [
             'GET'     => ['GET'],
             'HEAD'    => ['HEAD'],
-            'DELETE'  => ['DELETE'],
             'OPTIONS' => ['OPTIONS'],
         ];
     }