From 18f14d1720c05565fe2a7be757100abc69079b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Gl=C3=BCpker?= Date: Thu, 27 May 2021 12:10:30 +0200 Subject: [PATCH] Fixes #3573 - Accept 2xx as response for requests in UserAgent --- lib/user_agent.rb | 2 +- test/integration/user_agent_test.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/user_agent.rb b/lib/user_agent.rb index b428c0667..d20483ba9 100644 --- a/lib/user_agent.rb +++ b/lib/user_agent.rb @@ -472,7 +472,7 @@ returns url = response['location'] return get(url, params, options, count - 1) - when Net::HTTPOK, Net::HTTPCreated + when Net::HTTPSuccess data = nil if options[:json] && !options[:jsonParseDisable] && response.body data = JSON.parse(response.body) diff --git a/test/integration/user_agent_test.rb b/test/integration/user_agent_test.rb index dca37ad15..b1f4fa6c9 100644 --- a/test/integration/user_agent_test.rb +++ b/test/integration/user_agent_test.rb @@ -32,6 +32,21 @@ class UserAgentTest < ActiveSupport::TestCase assert_match(%r{"remote_ip":"#{ENV['ZAMMAD_PROXY_REMOTE_IP_CHECK']}"}, result.body) end + # get / 202 + result = UserAgent.get( + "#{host}/test/get_accepted/1?submitted=123", + ) + assert(result) + assert_equal(true, result.success?) + assert_equal('202', result.code) + assert_equal(String, result.body.class) + assert(result.body.include?('"get"')) + assert(result.body.include?('"123"')) + assert(result.body.include?('"content_type_requested":null')) + if ENV['ZAMMAD_PROXY_TEST'] == 'true' && ENV['ZAMMAD_PROXY_REMOTE_IP_CHECK'] + assert_match(%r{"remote_ip":"#{ENV['ZAMMAD_PROXY_REMOTE_IP_CHECK']}"}, result.body) + end + # get / 404 result = UserAgent.get( "#{host}/test/not_existing",