Fix Proc#arity failures in test:mri

jruby · May 12, 2015 · 7501519 · 7501519
1 parent 5720901
commit 7501519
Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyProc.java b/core/src/main/java/org/jruby/RubyProc.java
@@ -325,7 +325,12 @@ public IRubyObject call(ThreadContext context, IRubyObject[] args, IRubyObject s
 
     @JRubyMethod(name = "arity")
     public RubyFixnum arity() {
-        return getRuntime().newFixnum(block.getSignature().arityValue());
+        Signature signature = block.getSignature();
+
+        if (block.type == Block.Type.LAMBDA) return getRuntime().newFixnum(signature.arityValue());
+
+        // FIXME: Consider min/max like MRI here instead of required + kwarg count.
+        return getRuntime().newFixnum(signature.hasRest() ? signature.arityValue() : signature.required() + signature.getRequiredKeywordForArityCount());
     }
 
     @JRubyMethod(name = "to_proc")

diff --git a/test/mri/excludes/TestProc.rb b/test/mri/excludes/TestProc.rb
@@ -1,4 +1,3 @@
-exclude :test_arity, "needs investigation"
 exclude :test_arity2, "needs investigation"
 exclude :test_attr_source_location, "needs investigation"
 exclude :test_bound_parameters, "needs investigation"