From 14f008c0232119eee531c17b6b6c635fd35f18c6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 18:43:57 +0000
Subject: [PATCH 1/4] Initial plan


From bd4cd5712fbcd061f40068675cf9f07b283bcaca Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 18:45:46 +0000
Subject: [PATCH 2/4] fix: update rspec-rails constraint to >= 6, < 9 and bump
 version to 0.4.0

Co-authored-by: Jeremy-Walton <5957102+Jeremy-Walton@users.noreply.github.com>
---
 lib/marsh_grass/version.rb | 2 +-
 marsh_grass.gemspec        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/marsh_grass/version.rb b/lib/marsh_grass/version.rb
index 9840f94..ad288e7 100644
--- a/lib/marsh_grass/version.rb
+++ b/lib/marsh_grass/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MarshGrass
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end
diff --git a/marsh_grass.gemspec b/marsh_grass.gemspec
index 921a95c..209a399 100644
--- a/marsh_grass.gemspec
+++ b/marsh_grass.gemspec
@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_dependency 'activesupport', '>= 7.1', '< 9.0'
   spec.add_dependency 'rspec', '~> 3.6'
-  spec.add_dependency 'rspec-rails', '~> 6'
+  spec.add_dependency 'rspec-rails', '>= 6', '< 9'
   spec.add_dependency 'timecop', '~> 0.9'
 end

From e9d76d30e57eae7918e9876f7a1781b2c2be3b2d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 19:04:20 +0000
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20add=20RSpec=204=20support=20?=
 =?UTF-8?q?=E2=80=94=20widen=20rspec=20constraint=20and=20add=20CI=20matri?=
 =?UTF-8?q?x=20entries=20for=20Ruby=204.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jeremy-Walton <5957102+Jeremy-Walton@users.noreply.github.com>
---
 .github/workflows/ci.yml                   | 6 ++++++
 gemfiles/rspec-4-activesupport-8.0.gemfile | 6 ++++++
 gemfiles/rspec-4-activesupport-8.1.gemfile | 6 ++++++
 marsh_grass.gemspec                        | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 gemfiles/rspec-4-activesupport-8.0.gemfile
 create mode 100644 gemfiles/rspec-4-activesupport-8.1.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f612da2..157f4b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,6 +52,12 @@ jobs:
             gemfile: activesupport-8.1
           - ruby: 3.1
             gemfile: activesupport-8.1
+        include:
+          # RSpec 4 (beta) - Ruby 4.0 only
+          - ruby: 4.0
+            gemfile: rspec-4-activesupport-8.0
+          - ruby: 4.0
+            gemfile: rspec-4-activesupport-8.1
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/gemfiles/rspec-4-activesupport-8.0.gemfile b/gemfiles/rspec-4-activesupport-8.0.gemfile
new file mode 100644
index 0000000..acd3584
--- /dev/null
+++ b/gemfiles/rspec-4-activesupport-8.0.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'activesupport', '~> 8.0.0'
+gem 'rspec', '~> 4.0'
+
+eval_gemfile "../Gemfile"
diff --git a/gemfiles/rspec-4-activesupport-8.1.gemfile b/gemfiles/rspec-4-activesupport-8.1.gemfile
new file mode 100644
index 0000000..8fdcfd6
--- /dev/null
+++ b/gemfiles/rspec-4-activesupport-8.1.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'activesupport', '~> 8.1.0'
+gem 'rspec', '~> 4.0'
+
+eval_gemfile "../Gemfile"
diff --git a/marsh_grass.gemspec b/marsh_grass.gemspec
index 209a399..e420c03 100644
--- a/marsh_grass.gemspec
+++ b/marsh_grass.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_dependency 'activesupport', '>= 7.1', '< 9.0'
-  spec.add_dependency 'rspec', '~> 3.6'
+  spec.add_dependency 'rspec', '>= 3.6', '< 5'
   spec.add_dependency 'rspec-rails', '>= 6', '< 9'
   spec.add_dependency 'timecop', '~> 0.9'
 end

From 6e7c0cf1f0b844fb516e23c853f605898c1c6735 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 19:09:45 +0000
Subject: [PATCH 4/4] revert: undo RSpec 4 support changes (rspec constraint,
 rspec-4 gemfiles, CI matrix includes)

Co-authored-by: Jeremy-Walton <5957102+Jeremy-Walton@users.noreply.github.com>
---
 .github/workflows/ci.yml                   | 6 ------
 gemfiles/rspec-4-activesupport-8.0.gemfile | 6 ------
 gemfiles/rspec-4-activesupport-8.1.gemfile | 6 ------
 marsh_grass.gemspec                        | 2 +-
 4 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 gemfiles/rspec-4-activesupport-8.0.gemfile
 delete mode 100644 gemfiles/rspec-4-activesupport-8.1.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 157f4b2..f612da2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,12 +52,6 @@ jobs:
             gemfile: activesupport-8.1
           - ruby: 3.1
             gemfile: activesupport-8.1
-        include:
-          # RSpec 4 (beta) - Ruby 4.0 only
-          - ruby: 4.0
-            gemfile: rspec-4-activesupport-8.0
-          - ruby: 4.0
-            gemfile: rspec-4-activesupport-8.1
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/gemfiles/rspec-4-activesupport-8.0.gemfile b/gemfiles/rspec-4-activesupport-8.0.gemfile
deleted file mode 100644
index acd3584..0000000
--- a/gemfiles/rspec-4-activesupport-8.0.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'activesupport', '~> 8.0.0'
-gem 'rspec', '~> 4.0'
-
-eval_gemfile "../Gemfile"
diff --git a/gemfiles/rspec-4-activesupport-8.1.gemfile b/gemfiles/rspec-4-activesupport-8.1.gemfile
deleted file mode 100644
index 8fdcfd6..0000000
--- a/gemfiles/rspec-4-activesupport-8.1.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'activesupport', '~> 8.1.0'
-gem 'rspec', '~> 4.0'
-
-eval_gemfile "../Gemfile"
diff --git a/marsh_grass.gemspec b/marsh_grass.gemspec
index e420c03..209a399 100644
--- a/marsh_grass.gemspec
+++ b/marsh_grass.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_dependency 'activesupport', '>= 7.1', '< 9.0'
-  spec.add_dependency 'rspec', '>= 3.6', '< 5'
+  spec.add_dependency 'rspec', '~> 3.6'
   spec.add_dependency 'rspec-rails', '>= 6', '< 9'
   spec.add_dependency 'timecop', '~> 0.9'
 end