[expectations] Merge pull request rspec/rspec-expectations#1258 from …

…rspec/conditionally-use-disable_monkey_patching Make specs inter-dependent, and backwards compatible'ish --- This commit was imported from rspec/rspec-expectations@a86200a.
yujinakayama · Dec 26, 2020 · 6ee774a · 6ee774a
2 parents dafabc8 + d515be4
commit 6ee774a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rspec-expectations/features/support/disallow_certain_apis.rb b/rspec-expectations/features/support/disallow_certain_apis.rb
@@ -21,7 +21,7 @@ def should_not(*)
     rspec.expose_dsl_globally = false
 
     rspec.mock_with :rspec do |mocks|
-      mocks.syntax = :expect
+      mocks.syntax = :expect if mocks.respond_to?(:syntax=) # RSpec 4 removed `syntax=`
     end
 
     rspec.expect_with :rspec do |expectations|

diff --git a/rspec-expectations/features/syntax_configuration.feature b/rspec-expectations/features/syntax_configuration.feature
@@ -68,7 +68,7 @@ Feature: Syntax Configuration
           expectations.syntax = :should
         end
         config.mock_with :rspec do |mocks|
-          mocks.syntax = :should
+          mocks.syntax = :should if mocks.respond_to?(:syntax=) # RSpec 4 removed `syntax=`
         end
       end
       """

diff --git a/rspec-expectations/spec/spec_helper.rb b/rspec-expectations/spec/spec_helper.rb
@@ -49,7 +49,7 @@ def hash_inspect(hash)
     mocks.verify_partial_doubles = true
   end
 
-  config.disable_monkey_patching!
+  config.disable_monkey_patching! if config.respond_to?(:disable_monkey_patching!) # RSpec 4 dropped this method
 
   # We don't want rspec-core to look in our `lib` for failure snippets.
   # When it does that, it inevitably finds this line: