From a43de73841abc01dd8a53eb2233cbe9f6e11f170 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 6 Sep 2019 19:26:43 +0900 Subject: [PATCH] Revert "Revert "send with **options only when options is not empty"" This reverts commit 2f141ab09ea0509895c5426ae3010819d2b4fc48. Ruby 2.6 and 2.5 do not work without this... --- actionpack/lib/action_dispatch/testing/integration.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 217dcd953e..50c4018a23 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -358,9 +358,13 @@ module ActionDispatch @html_document = nil end - integration_session.__send__(method, *args, **options).tap do - copy_session_variables! + result = if options.any? + integration_session.__send__(method, *args, **options) + else + integration_session.__send__(method, *args) end + copy_session_variables! + result end end