public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rubygem-rspec-rails] rawhide: Backport upstream BR to support rails 8.1 for spec testsuite
@ 2026-08-06  2:38 Mamoru TASAKA
  0 siblings, 0 replies; only message in thread
From: Mamoru TASAKA @ 2026-08-06  2:38 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rubygem-rspec-rails
Branch : rawhide
Commit : 3ba36cc141e7e11b390e075fe0fda4ecc4c45e14
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-08-06T11:38:08+09:00
Stats  : +56/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rubygem-rspec-rails/c/3ba36cc141e7e11b390e075fe0fda4ecc4c45e14?branch=rawhide

Log:
Backport upstream BR to support rails 8.1 for spec testsuite

---
diff --git a/rubygem-rspec-rails-pr2866-update-specs-for-rails.patch b/rubygem-rspec-rails-pr2866-update-specs-for-rails.patch
new file mode 100644
index 0000000..42cc8a0
--- /dev/null
+++ b/rubygem-rspec-rails-pr2866-update-specs-for-rails.patch
@@ -0,0 +1,49 @@
+From 8e0df8df128121d1e21260dd50de55fb7b068d6e Mon Sep 17 00:00:00 2001
+From: Jon Rowe <hello@jonrowe.co.uk>
+Date: Fri, 5 Sep 2025 10:16:59 +0100
+Subject: [PATCH] Update specs for rails main
+
+---
+ .../matchers/action_cable/have_stream_spec.rb  | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/spec/rspec/rails/matchers/action_cable/have_stream_spec.rb b/spec/rspec/rails/matchers/action_cable/have_stream_spec.rb
+index f257d2c9a..c592ea82e 100644
+--- a/spec/rspec/rails/matchers/action_cable/have_stream_spec.rb
++++ b/spec/rspec/rails/matchers/action_cable/have_stream_spec.rb
+@@ -158,9 +158,16 @@ def subscribed
+     it "fails with message" do
+       subscribe user: 42
+ 
++      broadcast_preamble =
++        if Rails.version.to_f < 8.1
++          "broadcast:StreamModel#"
++        else
++          "broadcast:"
++        end
++
+       expect {
+         expect(subscription).to have_stream_for(StreamModel.new(31_337))
+-      }.to raise_error(/expected to have stream "broadcast:StreamModel#31337" started, but have \["broadcast:StreamModel#42"\]/)
++      }.to raise_error(/expected to have stream "#{broadcast_preamble}31337" started, but have \["#{broadcast_preamble}42"\]/)
+     end
+ 
+     context "with negated form" do
+@@ -173,9 +180,16 @@ def subscribed
+       it "fails with message" do
+         subscribe user: 42
+ 
++        broadcast_id =
++          if Rails.version.to_f < 8.1
++            "broadcast:StreamModel#42"
++          else
++            "broadcast:42"
++          end
++
+         expect {
+           expect(subscription).not_to have_stream_for(StreamModel.new(42))
+-        }.to raise_error(/expected not to have stream "broadcast:StreamModel#42" started, but have \["broadcast:StreamModel#42"\]/)
++        }.to raise_error(/expected not to have stream "#{broadcast_id}" started, but have \["#{broadcast_id}"\]/)
+       end
+     end
+   end

diff --git a/rubygem-rspec-rails.spec b/rubygem-rspec-rails.spec
index fa130af..99baa29 100644
--- a/rubygem-rspec-rails.spec
+++ b/rubygem-rspec-rails.spec
@@ -6,7 +6,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 8.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: RSpec for Rails
 License: MIT
 URL: https://github.com/rspec/rspec-rails
@@ -18,6 +18,8 @@ Source1: %{gem_name}-%{version}-tests.tar.gz
 # dependency on chromedriver.
 # https://github.com/rspec/rspec-rails/pull/2856
 Patch0: rubygem-rspec-rails-8.0.1-Drop-driven-by-selenium.patch
+# https://github.com/rspec/rspec-rails/pull/2866/commits/8e0df8df128121d1e21260dd50de55fb7b068d6e
+Patch1: rubygem-rspec-rails-pr2866-update-specs-for-rails.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
@@ -54,6 +56,7 @@ Documentation for %{name}.
 (
 cd %{builddir}
 %patch 0 -p1
+%patch 1 -p1
 )
 
 %build
@@ -109,6 +112,9 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Thu Aug 06 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.0.1-5
+- Backport upstream BR to support rails 8.1 for spec testsuite
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-06  2:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-06  2:38 [rpms/rubygem-rspec-rails] rawhide: Backport upstream BR to support rails 8.1 for spec testsuite Mamoru TASAKA

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox