Merge pull request #118 from rbibby/master

Switched ApiException to use error title rather than detail as detail…
ans-group · Sep 30, 2019 · 9484b9e · 9484b9e
2 parents 31d45c6 + 381e895
commit 9484b9e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/Exception/ApiException.php b/src/Exception/ApiException.php
@@ -24,7 +24,12 @@ public function __construct($response)
         }
 
         if (!empty($this->errors)) {
-            $this->message = $this->errors[0]->detail;
+            $message = $this->errors[0]->detail;
+            if (empty($message)) {
+                $message = $this->errors[0]->title;
+            }
+
+            $this->message = $message;
         }
 
         $this->response = $response;

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -273,7 +273,7 @@ public function wraps_server_exceptions_as_ukfast_exceptions()
             new Response(500, [], json_encode([
                 'errors' => [[
                     'title' => 'Testing errors',
-                    'detail' => 'Testing errors detail',
+                    'detail' => 'Testing errors',
                     'status' => 500,
                 ]]
             ])),
@@ -286,7 +286,34 @@ public function wraps_server_exceptions_as_ukfast_exceptions()
             $client->request('GET', '/');
         } catch (ApiException $e) {
             $this->assertEquals(1, count($e->getErrors()));
-            $this->assertEquals('Testing errors detail', $e->getMessage());
+            $this->assertEquals('Testing errors', $e->getMessage());
+            return;
+        }
+
+        $this->expectException(ApiException::class);
+    }
+
+    /**
+     * @test
+     */
+    public function defaults_exception_message_to_title_if_no_detail_is_set()
+    {
+        $mock = new MockHandler([
+            new Response(500, [], json_encode([
+                'errors' => [[
+                    'title' => 'Testing errors title',
+                    'status' => 500,
+                ]]
+            ])),
+        ]);
+        $handler = HandlerStack::create($mock);
+        $guzzle = new Guzzle(['handler' => $handler]);
+        $client = new Client($guzzle);
+
+        try {
+            $client->request('GET', '/');
+        } catch (ApiException $e) {
+            $this->assertEquals('Testing errors title', $e->getMessage());
             return;
         }