Extract function to validate and decode response JSON

laravel · Dec 10, 2015 · 5f4a991 · 5f4a991
1 parent 89dda85
commit 5f4a991
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php b/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
@@ -280,14 +280,8 @@ protected function seeJsonContains(array $data, $negate = false)
     {
         $method = $negate ? 'assertFalse' : 'assertTrue';
 
-        $actual = json_decode($this->response->getContent(), true);
-
-        if (is_null($actual) || $actual === false) {
-            return $this->fail('Invalid JSON was returned from the route. Perhaps an exception was thrown?');
-        }
-
         $actual = json_encode(Arr::sortRecursive(
-            (array) $actual
+            (array) $this->decodeResponseJson()
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
@@ -310,15 +304,25 @@ protected function seeJsonContains(array $data, $negate = false)
      */
     protected function seeJsonSubset(array $data)
     {
-        $actual = json_decode($this->response->getContent(), true);
+        $this->assertArraySubset($data, $this->decodeResponseJson());
 
-        if (is_null($actual) || $actual === false) {
-            return $this->fail('Invalid JSON was returned from the route. Perhaps an exception was thrown?');
-        }
+        return $this;
+    }
+
+    /**
+     * Validate and return the decoded response JSON.
+     *
+     * @return array
+     */
+    protected function decodeResponseJson()
+    {
+        $decodedResponse = json_decode($this->response->getContent(), true);
 
-        $this->assertArraySubset($data, $actual);
+        if (is_null($decodedResponse) || $decodedResponse === false) {
+            $this->fail('Invalid JSON was returned from the route. Perhaps an exception was thrown?');
+        }
 
-        return $this;
+        return $decodedResponse;
     }
 
     /**