1 files changed, 49 insertions, 60 deletions
diff --git a/spec/ruby/core/enumerable/all_spec.rb b/spec/ruby/core/enumerable/all_spec.rb
index 8af80896a9..ae255c662c 100644
--- a/spec/ruby/core/enumerable/all_spec.rb
+++ b/spec/ruby/core/enumerable/all_spec.rb
@@ -26,15 +26,6 @@ describe "Enumerable#all?" do
     -> { {}.all?(1, 2, 3) }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ""..."2.5" do
-    it "raises an ArgumentError when any arguments provided" do
-      -> { @enum.all?(Proc.new {}) }.should raise_error(ArgumentError)
-      -> { @enum.all?(nil) }.should raise_error(ArgumentError)
-      -> { @empty.all?(1) }.should raise_error(ArgumentError)
-      -> { @enum1.all?(1) {} }.should raise_error(ArgumentError)
-    end
-  end
-
   it "does not hide exceptions out of #each" do
     -> {
       EnumerableSpecs::ThrowingEach.new.all?
@@ -133,69 +124,67 @@ describe "Enumerable#all?" do
     end
   end
 
-  ruby_version_is "2.5" do
-    describe 'when given a pattern argument' do
-      it "calls `===` on the pattern the return value " do
-        pattern = EnumerableSpecs::Pattern.new { |x| x >= 0 }
-        @enum1.all?(pattern).should == false
-        pattern.yielded.should == [[0], [1], [2], [-1]]
-      end
+  describe 'when given a pattern argument' do
+    it "calls `===` on the pattern the return value " do
+      pattern = EnumerableSpecs::Pattern.new { |x| x >= 0 }
+      @enum1.all?(pattern).should == false
+      pattern.yielded.should == [[0], [1], [2], [-1]]
+    end
 
-      # may raise an exception in future versions
-      ruby_version_is ""..."2.6" do
-        it "ignores block" do
-          @enum2.all?(NilClass) { raise }.should == false
-          [1, 2, nil].all?(NilClass) { raise }.should == false
-          {a: 1}.all?(Array) { raise }.should == true
-        end
+    # may raise an exception in future versions
+    ruby_version_is ""..."2.6" do
+      it "ignores block" do
+        @enum2.all?(NilClass) { raise }.should == false
+        [1, 2, nil].all?(NilClass) { raise }.should == false
+        {a: 1}.all?(Array) { raise }.should == true
       end
+    end
 
-      it "always returns true on empty enumeration" do
-        @empty.all?(Integer).should == true
-        [].all?(Integer).should == true
-        {}.all?(NilClass).should == true
-      end
+    it "always returns true on empty enumeration" do
+      @empty.all?(Integer).should == true
+      [].all?(Integer).should == true
+      {}.all?(NilClass).should == true
+    end
 
-      it "does not hide exceptions out of #each" do
-        -> {
-          EnumerableSpecs::ThrowingEach.new.all?(Integer)
-        }.should raise_error(RuntimeError)
-      end
+    it "does not hide exceptions out of #each" do
+      -> {
+        EnumerableSpecs::ThrowingEach.new.all?(Integer)
+      }.should raise_error(RuntimeError)
+    end
 
-      it "returns true if the pattern never returns false or nil" do
-        pattern = EnumerableSpecs::Pattern.new { |x| 42 }
-        @enum.all?(pattern).should == true
+    it "returns true if the pattern never returns false or nil" do
+      pattern = EnumerableSpecs::Pattern.new { |x| 42 }
+      @enum.all?(pattern).should == true
 
-        [1, 42, 3].all?(pattern).should == true
+      [1, 42, 3].all?(pattern).should == true
 
-        pattern = EnumerableSpecs::Pattern.new { |x| Array === x }
-        {a: 1, b: 2}.all?(pattern).should == true
-      end
+      pattern = EnumerableSpecs::Pattern.new { |x| Array === x }
+      {a: 1, b: 2}.all?(pattern).should == true
+    end
 
-      it "returns false if the pattern ever returns false or nil" do
-        pattern = EnumerableSpecs::Pattern.new { |x| x >= 0 }
-        @enum1.all?(pattern).should == false
-        pattern.yielded.should == [[0], [1], [2], [-1]]
+    it "returns false if the pattern ever returns false or nil" do
+      pattern = EnumerableSpecs::Pattern.new { |x| x >= 0 }
+      @enum1.all?(pattern).should == false
+      pattern.yielded.should == [[0], [1], [2], [-1]]
 
-        [1, 2, 3, -1].all?(pattern).should == false
+      [1, 2, 3, -1].all?(pattern).should == false
 
-        pattern = EnumerableSpecs::Pattern.new { |x| x[1] >= 0 }
-        {a: 1, b: -1}.all?(pattern).should == false
-      end
+      pattern = EnumerableSpecs::Pattern.new { |x| x[1] >= 0 }
+      {a: 1, b: -1}.all?(pattern).should == false
+    end
 
-      it "does not hide exceptions out of pattern#===" do
-        pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
-        -> {
-          @enum.all?(pattern)
-        }.should raise_error(RuntimeError)
-      end
+    it "does not hide exceptions out of pattern#===" do
+      pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
+      -> {
+        @enum.all?(pattern)
+      }.should raise_error(RuntimeError)
+    end
 
-      it "calls the pattern with gathered array when yielded with multiple arguments" do
-        multi = EnumerableSpecs::YieldsMulti.new
-        pattern = EnumerableSpecs::Pattern.new { true }
-        multi.all?(pattern).should == true
-        pattern.yielded.should == [[[1, 2]], [[3, 4, 5]], [[6, 7, 8, 9]]]
-      end
+    it "calls the pattern with gathered array when yielded with multiple arguments" do
+      multi = EnumerableSpecs::YieldsMulti.new
+      pattern = EnumerableSpecs::Pattern.new { true }
+      multi.all?(pattern).should == true
+      pattern.yielded.should == [[[1, 2]], [[3, 4, 5]], [[6, 7, 8, 9]]]
     end
   end
 end