From c3105bb804b510ca3cdca665fff1075176cb9573 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 22 Jun 2018 14:27:32 +0200 Subject: [PATCH] Add response body to result of client errors because there might be information provided by the server. --- lib/user_agent.rb | 1 + test/integration/user_agent_test.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/user_agent.rb b/lib/user_agent.rb index 0ee250f67..b6354a422 100644 --- a/lib/user_agent.rb +++ b/lib/user_agent.rb @@ -401,6 +401,7 @@ returns error: "Client Error: #{response.inspect}!", success: false, code: response.code, + body: response.body ) when Net::HTTPInternalServerError return Result.new( diff --git a/test/integration/user_agent_test.rb b/test/integration/user_agent_test.rb index d3f7b19a6..eb99fb5f9 100644 --- a/test/integration/user_agent_test.rb +++ b/test/integration/user_agent_test.rb @@ -157,7 +157,7 @@ class UserAgentTest < ActiveSupport::TestCase assert(result) assert_equal(false, result.success?) assert_equal('401', result.code) - assert_equal(NilClass, result.body.class) + assert_equal("HTTP Basic: Access denied.\n", result.body) # post / 200 result = UserAgent.post( @@ -195,7 +195,7 @@ class UserAgentTest < ActiveSupport::TestCase assert(result) assert_equal(false, result.success?) assert_equal('401', result.code) - assert_equal(NilClass, result.body.class) + assert_equal("HTTP Basic: Access denied.\n", result.body) # put / 200 result = UserAgent.put( @@ -233,7 +233,7 @@ class UserAgentTest < ActiveSupport::TestCase assert(result) assert_equal(false, result.success?) assert_equal('401', result.code) - assert_equal(NilClass, result.body.class) + assert_equal("HTTP Basic: Access denied.\n", result.body) # delete / 200 result = UserAgent.delete( @@ -264,7 +264,7 @@ class UserAgentTest < ActiveSupport::TestCase assert(result) assert_equal(false, result.success?) assert_equal('401', result.code) - assert_equal(NilClass, result.body.class) + assert_equal("HTTP Basic: Access denied.\n", result.body) end # check @@ -315,7 +315,7 @@ class UserAgentTest < ActiveSupport::TestCase assert(result) assert_equal(false, result.success?) assert_equal('401', result.code) - assert_equal(NilClass, result.body.class) + assert_equal("HTTP Basic: Access denied.\n", result.body) end # check @@ -479,7 +479,7 @@ class UserAgentTest < ActiveSupport::TestCase assert(result.body =~ /"remote_ip":"#{ENV['ZAMMAD_PROXY_REMOTE_IP_CHECK']}"/) end - # get / 401 + # get / 404 result = UserAgent.get( "#{host}/test/not_existing", {