Move it parameter related specs from language/block_spec.rb to language/it_parameter_spec.rb

Author: andrykonchin

language/block_spec.rb

@@ -1041,7 +1041,7 @@ def all_kwrest(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, **
   end
 end
 
-describe "`it` calls without arguments in a block with no ordinary parameters" do
+describe "`it` calls without arguments in a block" do
   ruby_version_is "3.3"..."3.4" do
     it "emits a deprecation warning" do
       -> {
@@ -1094,59 +1094,11 @@ def o.it
       end
     end
   end
-
-  ruby_version_is "3.4" do
-    it "does not emit a deprecation warning" do
-      -> {
-        eval "proc { it }"
-      }.should_not complain
-    end
-
-    it "acts as the first argument if no local variables exist" do
-      eval("proc { it * 2 }").call(5).should == 10
-    end
-
-    it "acts as the first argument if multiple arguments given" do
-      eval("proc { it * 2 }").call(5, 1, 2, 3).should == 10
-    end
-
-    it "can be reassigned to act as a local variable" do
-      eval("proc { tmp = it; it = tmp * 2; it }").call(21).should == 42
-    end
-
-    it "can be used in nested calls" do
-      it_values = []
-      eval("proc { it.each { it_values << it } }").call([1, 2, 3])
-      it_values.should == [1, 2, 3]
-    end
-
-    it "cannot be mixed with numbered parameters" do
-      -> {
-        eval "proc { it + _1 }"
-      }.should raise_error(SyntaxError, /numbered parameters are not allowed when 'it' is already used|'it' is already used in/)
-
-      -> {
-        eval "proc { _1 + it }"
-      }.should raise_error(SyntaxError, /numbered parameter is already used in|'it' is not allowed when a numbered parameter is already used/)
-    end
-
-    it "is available before re-assigning" do
-      a = nil
-      proc { a = it; it = 42 }.call(0)
-      a.should == 0
-    end
-
-    it "does not call the method `it` if defined" do
-      o = Object.new
-      def o.it
-        21
-      end
-
-      o.instance_eval("proc { it * 2 }").call(1).should == 2
-    end
-  end
 end
 
+# Duplicates specs in language/it_parameter_spec.rb
+# Need them here to run on Ruby versions prior 3.4
+# TODO: remove when the minimal supported Ruby version is 3.4
 describe "if `it` is defined as a variable" do
   it "treats `it` as a captured variable if defined outside of a block" do
     it = 5

language/it_parameter_spec.rb

@@ -17,9 +17,28 @@
       -> { it + -> { it * it }.call(2) }.call(3).should == 7
     end
 
+    it "can be reassigned to act as a local variable" do
+      proc { tmp = it; it = tmp * 2; it }.call(21).should == 42
+    end
+
     it "is a regular local variable if there is already a 'it' local variable" do
-        it = 0
-        proc { it }.call("a").should == 0
+      it = 0
+      proc { it }.call("a").should == 0
+    end
+
+    it "is a regular local variable if there is a method `it` defined" do
+      o = Object.new
+      def o.it
+        21
+      end
+
+      o.instance_eval("proc { it * 2 }").call(1).should == 2
+    end
+
+    it "is not shadowed by an reassignment in a block" do
+      a = nil
+      proc { a = it; it = 42 }.call(0)
+      a.should == 0 # if `it` were shadowed its value would be nil
     end
 
     it "raises SyntaxError when block parameters are specified explicitly" do
@@ -36,6 +55,16 @@
       -> { eval("['a'].map { |x| it }") }.should raise_error(SyntaxError, /ordinary parameter is defined/)
     end
 
+    it "cannot be mixed with numbered parameters" do
+      -> {
+        eval("proc { it + _1 }")
+      }.should raise_error(SyntaxError, /numbered parameters are not allowed when 'it' is already used|'it' is already used in/)
+
+      -> {
+        eval("proc { _1 + it }")
+      }.should raise_error(SyntaxError, /numbered parameter is already used in|'it' is not allowed when a numbered parameter is already used/)
+    end
+
     it "affects block arity" do
       -> {}.arity.should == 0
       -> { it }.arity.should == 1
@@ -62,5 +91,16 @@ def obj.foo; it; end
 
       -> { obj.foo("a") }.should raise_error(ArgumentError, /wrong number of arguments/)
     end
+
+    context "given multiple arguments" do
+      it "provides it in a block and assigns the first argument for a block" do
+        proc { it }.call("a", "b").should == "a"
+      end
+
+      it "raises ArgumentError for a proc" do
+        -> { -> { it }.call("a", "b") }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+        -> { lambda { it }.call("a", "b") }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+      end
+    end
   end
 end