Crankshaft[BU000005X2NR89] .NET client @ 2018-07-05 10:03:39 UTC

gocardless · Jul 5, 2018 · bff7897 · bff7897
1 parent 6c0bbae
commit bff7897
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/GoCardless.Tests/ErrorTests.cs b/GoCardless.Tests/ErrorTests.cs
@@ -101,6 +101,26 @@ public async Task TrueServerError()
             Assert.Fail("Exception was not thrown");
         }
 
+        [Test]
+        public async Task HtmlErrorPage()
+        {
+            var responseFixture = "fixtures/error_page.html";
+            mockHttp.EnqueueResponse(502, responseFixture);
+            try
+            {
+                await MakeSomeRequest();
+            }
+            catch (ApiException ex)
+            {
+                Assert.AreEqual(502, ex.Code);
+                Assert.AreEqual(ApiErrorType.GOCARDLESS, ex.Type);
+                Assert.AreEqual("Something went wrong with this request. Please check the ResponseMessage property.", ex.Message);
+                Assert.AreEqual("<!DOCTYPE html>\n<html>\n  <head>\n    <title>This is an HTML error page, like one returned by Cloudflare</title>\n  </head>\n</html>\n", ex.ResponseMessage.Content.ReadAsStringAsync().Result);
+                return;
+            }
+            Assert.Fail("Exception was not thrown");
+        }
+
         [Test]
         public async Task IdempotencyConflictsAreHandledAutomatically()
         {

diff --git a/GoCardless.Tests/GoCardless.Tests.csproj b/GoCardless.Tests/GoCardless.Tests.csproj
@@ -53,6 +53,9 @@
     <None Update="fixtures\client\list_mandates_page_2.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="fixtures\error_page.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="fixtures\idempotent_creation_conflict.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -97,4 +100,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/GoCardless.Tests/fixtures/error_page.html b/GoCardless.Tests/fixtures/error_page.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>This is an HTML error page, like one returned by Cloudflare</title>
+  </head>
+</html>
diff --git a/GoCardless/GoCardlessClient.cs b/GoCardless/GoCardlessClient.cs
@@ -186,7 +186,7 @@ private async Task<T> ExecuteAsyncInner<T>(string method, string path, List<KeyV
                     throw result.ToException();
                 }
             }
-            catch (JsonSerializationException)
+            catch (JsonException)
             {
                 throw new ApiException(new ApiErrorResponse()
                 {