1 files changed, 39 insertions, 42 deletions
diff --git a/spec/ruby/library/matrix/vector/each2_spec.rb b/spec/ruby/library/matrix/vector/each2_spec.rb
index bdd6966472..10d2fc404d 100644
--- a/spec/ruby/library/matrix/vector/each2_spec.rb
+++ b/spec/ruby/library/matrix/vector/each2_spec.rb
@@ -1,52 +1,49 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Vector.each2" do
+  before :all do
+    @v = Vector[1, 2, 3]
+    @v2 = Vector[4, 5, 6]
+  end
+
+  it "requires one argument" do
+    -> { @v.each2(@v2, @v2){} }.should raise_error(ArgumentError)
+    -> { @v.each2(){} }.should raise_error(ArgumentError)
+  end
+
+  describe "given one argument" do
+    it "accepts an Array argument" do
+      a = []
+      @v.each2([7, 8, 9]){|x, y| a << x << y}
+      a.should == [1, 7, 2, 8, 3, 9]
+    end
+
+    it "raises a DimensionMismatch error if the Vector size is different" do
+      -> { @v.each2(Vector[1,2]){}     }.should raise_error(Vector::ErrDimensionMismatch)
+      -> { @v.each2(Vector[1,2,3,4]){} }.should raise_error(Vector::ErrDimensionMismatch)
+    end
+
+    it "yields arguments in sequence" do
+      a = []
+      @v.each2(@v2){|first, second| a << [first, second]}
+      a.should == [[1, 4], [2, 5], [3, 6]]
+    end
 
-  describe "Vector.each2" do
-    before :all do
-      @v = Vector[1, 2, 3]
-      @v2 = Vector[4, 5, 6]
+    it "yield arguments in pairs" do
+      a = []
+      @v.each2(@v2){|*pair| a << pair}
+      a.should == [[1, 4], [2, 5], [3, 6]]
     end
 
-    it "requires one argument" do
-      -> { @v.each2(@v2, @v2){} }.should raise_error(ArgumentError)
-      -> { @v.each2(){} }.should raise_error(ArgumentError)
+    it "returns self when given a block" do
+      @v.each2(@v2){}.should equal(@v)
     end
 
-    describe "given one argument" do
-      it "accepts an Array argument" do
-        a = []
-        @v.each2([7, 8, 9]){|x, y| a << x << y}
-        a.should == [1, 7, 2, 8, 3, 9]
-      end
-
-      it "raises a DimensionMismatch error if the Vector size is different" do
-        -> { @v.each2(Vector[1,2]){}     }.should raise_error(Vector::ErrDimensionMismatch)
-        -> { @v.each2(Vector[1,2,3,4]){} }.should raise_error(Vector::ErrDimensionMismatch)
-      end
-
-      it "yields arguments in sequence" do
-        a = []
-        @v.each2(@v2){|first, second| a << [first, second]}
-        a.should == [[1, 4], [2, 5], [3, 6]]
-      end
-
-      it "yield arguments in pairs" do
-        a = []
-        @v.each2(@v2){|*pair| a << pair}
-        a.should == [[1, 4], [2, 5], [3, 6]]
-      end
-
-      it "returns self when given a block" do
-        @v.each2(@v2){}.should equal(@v)
-      end
-
-      it "returns an enumerator if no block given" do
-        enum = @v.each2(@v2)
-        enum.should be_an_instance_of(Enumerator)
-        enum.to_a.should == [[1, 4], [2, 5], [3, 6]]
-      end
+    it "returns an enumerator if no block given" do
+      enum = @v.each2(@v2)
+      enum.should be_an_instance_of(Enumerator)
+      enum.to_a.should == [[1, 4], [2, 5], [3, 6]]
     end
   end
 end