diff --git a/actionpack-6.1.4.1.gem b/actionpack-6.1.4.1.gem deleted file mode 100644 index 71aa9a748f9946c8325218340de68aa3b0776d96..0000000000000000000000000000000000000000 Binary files a/actionpack-6.1.4.1.gem and /dev/null differ diff --git a/actionpack-6.1.4.1-tests.txz b/actionpack-7.0.4-tests.txz similarity index 94% rename from actionpack-6.1.4.1-tests.txz rename to actionpack-7.0.4-tests.txz index 7a254458a6ce29e66943768c656934eaa4c0a67a..8c81f0f0ccfc780152c961ff61ba2429d509fcce 100644 Binary files a/actionpack-6.1.4.1-tests.txz and b/actionpack-7.0.4-tests.txz differ diff --git a/actionpack-7.0.4.gem b/actionpack-7.0.4.gem new file mode 100644 index 0000000000000000000000000000000000000000..07121d79ac8437c9239f537fca5fde5ac307b322 Binary files /dev/null and b/actionpack-7.0.4.gem differ diff --git a/rails-6.1.4.1-tools.txz b/rails-7.0.4-tools.txz similarity index 95% rename from rails-6.1.4.1-tools.txz rename to rails-7.0.4-tools.txz index 2a295780575dec0533adacc500837f9b5da9206a..a34575fdf39b93e8e835d608b0b5ba493a31d89d 100644 Binary files a/rails-6.1.4.1-tools.txz and b/rails-7.0.4-tools.txz differ diff --git a/rubygem-actionpack-7.0.2.3-Fix-tests-for-minitest-5.16.patch b/rubygem-actionpack-7.0.2.3-Fix-tests-for-minitest-5.16.patch new file mode 100644 index 0000000000000000000000000000000000000000..c649382b882afee35fad72367790b34992615026 --- /dev/null +++ b/rubygem-actionpack-7.0.2.3-Fix-tests-for-minitest-5.16.patch @@ -0,0 +1,140 @@ +From 9766eb4a833c26c64012230b96dd1157ebb8e8a2 Mon Sep 17 00:00:00 2001 +From: eileencodes +Date: Wed, 15 Jun 2022 12:44:11 -0400 +Subject: [PATCH] Fix tests for minitest 5.16 + +In minitest/minitest@6e06ac9 minitest changed such that it now accepts +`kwargs` instead of requiring kwargs to be shoved into the args array. +This is a good change but required some updates to our test code to get +the new version of minitest passing. + +Changes are as follows: + +1) Lock minitest to 5.15 for Ruby 2.7. We don't love this change but +it's pretty difficult to get 2.7 and 3.0 to play nicely together with +the new kwargs changes. Dropping 2.7 support isn't an option right +now for Rails. This is safe because all of the code changes here are +internal methods to Rails like assert_called_with. Applications +shouldn't be consuming them as they are no-doc'd. +2) Update the `assert_called_with` method to take any kwargs but also +the returns kwarg. +3) Update callers of `assert_called_with` to move the kwargs outside the +args array. +4) Update the message from marshaled exceptions. In 5.16 the exception +message is "result not reported" instead of "Wrapped undumpable +exception". + +Co-authored-by: Matthew Draper +--- + .../test/controller/integration_test.rb | 26 ++--- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb +index 2fcd56e71a589..99f92b3c3d07c 100644 +--- a/actionpack/test/controller/integration_test.rb ++++ b/actionpack/test/controller/integration_test.rb +@@ -36,91 +36,91 @@ def test_follow_redirect_raises_when_no_redirect + def test_get + path = "/index"; params = "blah"; headers = { location: "blah" } + +- assert_called_with @session, :process, [:get, path, params: params, headers: headers] do ++ assert_called_with @session, :process, [:get, path], params: params, headers: headers do + @session.get(path, params: params, headers: headers) + end + end + + def test_get_with_env_and_headers + path = "/index"; params = "blah"; headers = { location: "blah" }; env = { "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest" } +- assert_called_with @session, :process, [:get, path, params: params, headers: headers, env: env] do ++ assert_called_with @session, :process, [:get, path], params: params, headers: headers, env: env do + @session.get(path, params: params, headers: headers, env: env) + end + end + + def test_post + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:post, path, params: params, headers: headers] do ++ assert_called_with @session, :process, [:post, path], params: params, headers: headers do + @session.post(path, params: params, headers: headers) + end + end + + def test_patch + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:patch, path, params: params, headers: headers] do ++ assert_called_with @session, :process, [:patch, path], params: params, headers: headers do + @session.patch(path, params: params, headers: headers) + end + end + + def test_put + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:put, path, params: params, headers: headers] do ++ assert_called_with @session, :process, [:put, path], params: params, headers: headers do + @session.put(path, params: params, headers: headers) + end + end + + def test_delete + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:delete, path, params: params, headers: headers] do ++ assert_called_with @session, :process, [:delete, path], params: params, headers: headers do + @session.delete(path, params: params, headers: headers) + end + end + + def test_head + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:head, path, params: params, headers: headers] do ++ assert_called_with @session, :process, [:head, path], params: params, headers: headers do + @session.head(path, params: params, headers: headers) + end + end + + def test_xml_http_request_get + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:get, path, params: params, headers: headers, xhr: true] do ++ assert_called_with @session, :process, [:get, path], params: params, headers: headers, xhr: true do + @session.get(path, params: params, headers: headers, xhr: true) + end + end + + def test_xml_http_request_post + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:post, path, params: params, headers: headers, xhr: true] do ++ assert_called_with @session, :process, [:post, path], params: params, headers: headers, xhr: true do + @session.post(path, params: params, headers: headers, xhr: true) + end + end + + def test_xml_http_request_patch + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:patch, path, params: params, headers: headers, xhr: true] do ++ assert_called_with @session, :process, [:patch, path], params: params, headers: headers, xhr: true do + @session.patch(path, params: params, headers: headers, xhr: true) + end + end + + def test_xml_http_request_put + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:put, path, params: params, headers: headers, xhr: true] do ++ assert_called_with @session, :process, [:put, path], params: params, headers: headers, xhr: true do + @session.put(path, params: params, headers: headers, xhr: true) + end + end + + def test_xml_http_request_delete + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:delete, path, params: params, headers: headers, xhr: true] do ++ assert_called_with @session, :process, [:delete, path], params: params, headers: headers, xhr: true do + @session.delete(path, params: params, headers: headers, xhr: true) + end + end + + def test_xml_http_request_head + path = "/index"; params = "blah"; headers = { location: "blah" } +- assert_called_with @session, :process, [:head, path, params: params, headers: headers, xhr: true] do ++ assert_called_with @session, :process, [:head, path], params: params, headers: headers, xhr: true do + @session.head(path, params: params, headers: headers, xhr: true) + end + end diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec index b8d561c6c83a14933eb640c5c3be0bd54facea02..7c572e2aa69f347ae6b2ecf4614abdb081aec1ba 100644 --- a/rubygem-actionpack.spec +++ b/rubygem-actionpack.spec @@ -3,14 +3,25 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.4.1 -Release: 2 +Version: 7.0.4 +Release: 1 Summary: Web-flow and rendering framework putting the VC in MVC (part of Rails) License: MIT URL: http://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# ActionPack gem doesn't ship with the test suite. +# You may check it out like so +# git clone http://github.com/rails/rails.git +# cd rails/actionpack && git archive -v -o actionpack-7.0.4-tests.txz v7.0.4 test/ Source1: %{gem_name}-%{version}-tests.txz +# The tools are needed for the test suite, are however unpackaged in gem file. +# You may get them like so +# git clone http://github.com/rails/rails.git --no-checkout +# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/ Source2: rails-%{version}-tools.txz +# Fixes for Minitest 5.16+ +# https://github.com/rails/rails/pull/45370 +Patch0: rubygem-actionpack-7.0.2.3-Fix-tests-for-minitest-5.16.patch # Let's keep Requires and BuildRequires sorted alphabeticaly BuildRequires: ruby(release) @@ -49,6 +60,10 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 +pushd %{_builddir} +%patch0 -p2 +popd + %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -89,6 +104,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Jan 19 2023 yanxiaobing - 1:7.0.4-1 +- Upgrade to version 7.0.4 + * Thu Jun 30 2022 houyingchao - 1:6.1.4.1-2 - Fix compilation failed