diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-10-01 19:11:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-01 19:11:24 +0100 |
| commit | 0a772e9952c6683769ac22be1b2304fcd86f02cb (patch) | |
| tree | 913ccfa8988bae59ab9651b5b9a20e1265157f7d /dev-ruby/actionpack | |
| parent | 8598ab9ad325d12d0f2901ecc0973e430dacd2b3 (diff) | |
gentoo auto-resync : 01:10:2022 - 19:11:24
Diffstat (limited to 'dev-ruby/actionpack')
| -rw-r--r-- | dev-ruby/actionpack/Manifest | 1 | ||||
| -rw-r--r-- | dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch | 55 |
2 files changed, 56 insertions, 0 deletions
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest index 64a30ef8ceb4..c44a147198c5 100644 --- a/dev-ruby/actionpack/Manifest +++ b/dev-ruby/actionpack/Manifest @@ -1,3 +1,4 @@ +AUX actionpack-7.0.4-rack-test-2.patch 2619 BLAKE2B f31791347de3a683270ed6720a4c33c069d29529ea6eab6b2721cd248029cc1130502d8d6aa9f9fa3433769fa58069502b7c1f9ffc330cb46f5163744967d51b SHA512 ceac0b24692512a03029ce24a1cb86da31669a1e91ab50537981d7dd3fcee861fcece37536cc63b8a3b6f07709dc8b8f64a5c3213a4c7c997208c3d73089cfc9 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f diff --git a/dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch b/dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch new file mode 100644 index 000000000000..09a234d46576 --- /dev/null +++ b/dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch @@ -0,0 +1,55 @@ +From 07be723bc1d2b6a655a589dfcd4213e251cdb453 Mon Sep 17 00:00:00 2001 +From: Aaron Patterson <aaron@rubyonrails.org> +Date: Wed, 25 May 2022 10:46:11 -0700 +Subject: [PATCH] Ensure Rails is green with Rack-Test main branch + +This commit just ensures we're green with the main branch of rack test. +The changes are things we should have done anyway, and are backwards +compatible with older versions of rack test +--- + actionpack/test/controller/new_base/render_streaming_test.rb | 4 ++++ + actionpack/test/dispatch/session/cache_store_test.rb | 2 +- + actionpack/test/dispatch/session/mem_cache_store_test.rb | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb +index 23dc6bca40364..d9789355f9520 100644 +--- a/test/controller/new_base/render_streaming_test.rb ++++ b/test/controller/new_base/render_streaming_test.rb +@@ -44,6 +44,10 @@ def explicit_cache + end + + class StreamingTest < Rack::TestCase ++ def get(path, headers: { "SERVER_PROTOCOL" => "HTTP/1.1", "HTTP_VERSION" => "HTTP/1.1" }) ++ super ++ end ++ + test "rendering with streaming enabled at the class level" do + get "/render_streaming/basic/hello_world" + assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n" +diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb +index 9677d177d0acc..6479654c73b37 100644 +--- a/test/dispatch/session/cache_store_test.rb ++++ b/test/dispatch/session/cache_store_test.rb +@@ -59,7 +59,7 @@ def test_getting_session_value_after_session_reset + get "/set_session_value" + assert_response :success + assert cookies["_session_id"] +- session_cookie = cookies.send(:hash_for)["_session_id"] ++ session_cookie = cookies.get_cookie("_session_id") + + get "/call_reset_session" + assert_response :success +diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb +index 417a8355bfc2a..188f321c5999f 100644 +--- a/test/dispatch/session/mem_cache_store_test.rb ++++ b/test/dispatch/session/mem_cache_store_test.rb +@@ -71,7 +71,7 @@ def test_getting_session_value_after_session_reset + get "/set_session_value" + assert_response :success + assert cookies["_session_id"] +- session_cookie = cookies.send(:hash_for)["_session_id"] ++ session_cookie = cookies.get_cookie("_session_id") + + get "/call_reset_session" + assert_response :success |