Merge pull request #1413 from rspec/use-skip-instead-of-if-else

Use :skip instead of :if/:unless
rspec · Feb 16, 2021 · 38de6cd · 38de6cd
2 parents ff318bc + c4f23a1
commit 38de6cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spec/rspec/mocks/matchers/receive_spec.rb b/spec/rspec/mocks/matchers/receive_spec.rb
@@ -54,13 +54,13 @@ module Mocks
           expect(receiver.foo).to eq(:curly)
         end
 
-        it 'does not support other matchers', :unless => options.include?(:allow_other_matchers) do
+        it 'does not support other matchers', :skip => options.include?(:allow_other_matchers) do
           expect {
             wrapped.to eq(3)
           }.to raise_error(UnsupportedMatcherError)
         end
 
-        it 'does support inherited matchers', :unless => options.include?(:allow_other_matchers) do
+        it 'does support inherited matchers', :skip => options.include?(:allow_other_matchers) do
           receive_foo = Class.new(RSpec::Mocks::Matchers::Receive).new(:foo, nil)
           wrapped.to receive_foo
           receiver.foo

diff --git a/spec/rspec/mocks/mutate_const_spec.rb b/spec/rspec/mocks/mutate_const_spec.rb
@@ -170,7 +170,7 @@ def change_const_value_to(value)
             expect(::Hash).to equal(top_level_hash)
           end
 
-          it 'does not affect the ability to access the top-level constant from nested contexts', :silence_warnings, :if => RUBY_VERSION < '2.5' do
+          it 'does not affect the ability to access the top-level constant from nested contexts', :silence_warnings, :skip => RUBY_VERSION >= '2.5' do
             top_level_hash = ::Hash
 
             hide_const("TestClass::Hash")