Change to 3.0 compatible syntax

mbj · Oct 18, 2020 · e9df5dc · e9df5dc
1 parent 9e5068e
commit e9df5dc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -49,7 +49,7 @@ def parse_expression(string)
 module XSpecHelper
   def verify_events(&block)
     expectations = raw_expectations
-      .map(&XSpec::MessageExpectation.method(:parse))
+      .map { |attributes| XSpec::MessageExpectation.parse(**attributes) }
 
     XSpec::ExpectationVerifier.verify(self, expectations, &block)
   end

diff --git a/spec/support/xspec.rb b/spec/support/xspec.rb
@@ -53,7 +53,11 @@ def validate_block_arity(observation, yields)
 
       # block allows anything we can skip the check
       return if observed.equal?(-1)
-      fail 'Optargs currently not supported' if observed < -1
+
+      if observed.negative?
+        observed = observed.succ.abs
+      end
+
       block_arity_mismatch(observation, expected, observed) unless expected.equal?(observed)
     end
 

diff --git a/spec/unit/mutant/isolation/fork_spec.rb b/spec/unit/mutant/isolation/fork_spec.rb
@@ -206,7 +206,7 @@ def apply
           *read_fragments,
           load_success,
           child_wait
-        ].map(&XSpec::MessageExpectation.method(:parse))
+        ].map { |attributes| XSpec::MessageExpectation.parse(**attributes) }
       end
 
       specify do
@@ -235,7 +235,7 @@ def apply
             }
           },
           child_wait
-        ].map(&XSpec::MessageExpectation.method(:parse))
+        ].map { |attributes| XSpec::MessageExpectation.parse(**attributes) }
       end
 
       specify do
@@ -258,7 +258,7 @@ def apply
               return: nil
             }
           }
-        ].map(&XSpec::MessageExpectation.method(:parse))
+        ].map { |attributes| XSpec::MessageExpectation.parse(**attributes) }
       end
 
       specify do
@@ -296,7 +296,7 @@ def apply
               return: [pid, status_error]
             }
           }
-        ].map(&XSpec::MessageExpectation.method(:parse))
+        ].map { |attributes| XSpec::MessageExpectation.parse(**attributes) }
       end
 
       specify do

diff --git a/spec/unit/mutant/parallel_spec.rb b/spec/unit/mutant/parallel_spec.rb
@@ -62,8 +62,8 @@ def ivar(value, **attributes)
       }
     end
 
-    def mvar(*arguments)
-      ivar(*arguments).merge(receiver: Variable::MVar)
+    def mvar(value, **arguments)
+      ivar(value, **arguments).merge(receiver: Variable::MVar)
     end
 
     let(:raw_expectations) do