Remove lambda default parameter to maintain ruby compatability

rspec · May 31, 2019 · 7e54f1f · 7e54f1f
1 parent bee5647
commit 7e54f1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/rspec/matchers/aliased_matcher.rb b/lib/rspec/matchers/aliased_matcher.rb
@@ -34,7 +34,7 @@ def method_missing(*)
       #
       # @api private
       def description
-        @description_block.call(super)
+        @description_block.call(super, false)
       end
 
       # Provides the failure_message of the aliased matcher. Aliased matchers
@@ -44,7 +44,7 @@ def description
       #
       # @api private
       def failure_message
-        @description_block.call(super, replace_after_start: true)
+        @description_block.call(super, true)
       end
 
       # Provides the failure_message_when_negated of the aliased matcher. Aliased matchers
@@ -54,7 +54,7 @@ def failure_message
       #
       # @api private
       def failure_message_when_negated
-        @description_block.call(super, replace_after_start: true)
+        @description_block.call(super, true)
       end
     end
 
@@ -105,7 +105,7 @@ def failure_message_when_negated
       def optimal_failure_message(same, inverted)
         if DefaultFailureMessages.has_default_failure_messages?(@base_matcher)
           base_message = @base_matcher.__send__(same)
-          overriden    = @description_block.call(base_message, replace_after_start: true)
+          overriden    = @description_block.call(base_message, true)
           return overriden if overriden != base_message
         end
 

diff --git a/lib/rspec/matchers/dsl.rb b/lib/rspec/matchers/dsl.rb
@@ -82,7 +82,7 @@ def define(name, &declarations)
       # @param old_name [Symbol] the name of the old (aliased) matcher
       def default_desc_override(new_name, old_name)
         old_name_split = EnglishPhrasing.split_words(old_name)
-        lambda do |old_desc, replace_after_start: false|
+        lambda do |old_desc, replace_after_start|
           if old_desc.start_with?(old_name_split) || replace_after_start
             old_desc.sub(old_name_split, EnglishPhrasing.split_words(new_name))
           else

diff --git a/spec/rspec/matchers/aliases_spec.rb b/spec/rspec/matchers/aliases_spec.rb
@@ -262,7 +262,7 @@ module RSpec
 
     specify do
       expect {
-        expect({}).to match(a_hash_including({a: 'include'}))
+        expect({}).to match(a_hash_including({:a => 'include'}))
       }.to fail_including(
         'expected {} to match (a hash including {:a => "include"}'
       )