[core] Merge pull request rspec/rspec-core#2884 from rspec/update-min…

…imum-rr-version Remove support for older RR test double framework versions --- This commit was imported from rspec/rspec-core@e0a4407.
yujinakayama · Apr 7, 2021 · f504c51 · f504c51
2 parents bd58fe8 + 9d3d09d
commit f504c51
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/rspec-core/Changelog.md b/rspec-core/Changelog.md
@@ -32,6 +32,7 @@ Breaking Changes:
 * Raise on attempt to use a legacy formatter without `rspec-legacy_formatters`.
   (Phil Pirozhkov, #2864)
 * Unify multi-condition filtering to use "all" semantic. (Phil Pirozhkov, #2874)
+* Remove support for RR test double framework version < 3.0. (Phil Pirozhkov, #2884)
 
 Enhancements:
 

diff --git a/rspec-core/lib/rspec/core/mocking_adapters/rr.rb b/rspec-core/lib/rspec/core/mocking_adapters/rr.rb
@@ -12,7 +12,7 @@ def self.framework_name
           :rr
         end
 
-        include ::RR::Extensions::InstanceMethods
+        include ::RR::DSL
 
         def setup_mocks_for_rspec
           ::RR::Space.instance.reset

diff --git a/rspec-core/rspec-core.gemspec b/rspec-core/rspec-core.gemspec
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coderay",  "~> 1.1.1"
 
   s.add_development_dependency "mocha",        "~> 0.13.0"
-  s.add_development_dependency "rr",           "~> 1.0.4"
+  s.add_development_dependency "rr",           "~> 3.0.0"
   s.add_development_dependency "flexmock",     "~> 0.9.0"
   s.add_development_dependency "thread_order", "~> 1.1.0"
 

diff --git a/rspec-core/spec/support/fake_libs/rr.rb b/rspec-core/spec/support/fake_libs/rr.rb
@@ -3,8 +3,6 @@ module Errors
     BACKTRACE_IDENTIFIER = /doesn't matter/
   end
 
-  module Extensions
-    module InstanceMethods
-    end
+  module DSL
   end
 end