1 files changed, 67 insertions, 81 deletions

diff --git a/spec/ruby/core/enumerable/none_spec.rb b/spec/ruby/core/enumerable/none_spec.rb
index 7c17e58a13..d9ee0b441e 100644
--- a/spec/ruby/core/enumerable/none_spec.rb
+++ b/spec/ruby/core/enumerable/none_spec.rb
@@ -10,49 +10,40 @@ describe "Enumerable#none?" do
   end
 
   it "always returns true on empty enumeration" do
-    @empty.none?.should == true
+    @empty.should.none?
     @empty.none? { true }.should == true
   end
 
   it "raises an ArgumentError when more than 1 argument is provided" do
-    -> { @enum.none?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { [].none?(1, 2, 3) }.should raise_error(ArgumentError)
-    -> { {}.none?(1, 2, 3) }.should raise_error(ArgumentError)
-  end
-
-  ruby_version_is ""..."2.5" do
-    it "raises an ArgumentError when any arguments provided" do
-      -> { @enum.none?(Proc.new {}) }.should raise_error(ArgumentError)
-      -> { @enum.none?(nil) }.should raise_error(ArgumentError)
-      -> { @empty.none?(1) }.should raise_error(ArgumentError)
-      -> { @enum.none?(1) {} }.should raise_error(ArgumentError)
-    end
+    -> { @enum.none?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { [].none?(1, 2, 3) }.should.raise(ArgumentError)
+    -> { {}.none?(1, 2, 3) }.should.raise(ArgumentError)
   end
 
   it "does not hide exceptions out of #each" do
     -> {
       EnumerableSpecs::ThrowingEach.new.none?
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
 
     -> {
       EnumerableSpecs::ThrowingEach.new.none? { false }
-    }.should raise_error(RuntimeError)
+    }.should.raise(RuntimeError)
   end
 
   describe "with no block" do
     it "returns true if none of the elements in self are true" do
       e = EnumerableSpecs::Numerous.new(false, nil, false)
-      e.none?.should be_true
+      e.none?.should == true
     end
 
     it "returns false if at least one of the elements in self are true" do
       e = EnumerableSpecs::Numerous.new(false, nil, true, false)
-      e.none?.should be_false
+      e.none?.should == false
     end
 
     it "gathers whole arrays as elements when each yields multiple" do
       multi = EnumerableSpecs::YieldsMultiWithFalse.new
-      multi.none?.should be_false
+      multi.none?.should == false
     end
   end
 
@@ -74,17 +65,17 @@ describe "Enumerable#none?" do
     end
 
     it "returns true if the block never returns true" do
-      @e.none? {|e| false }.should be_true
+      @e.none? {|e| false }.should == true
     end
 
     it "returns false if the block ever returns true" do
-      @e.none? {|e| e == 3 ? true : false }.should be_false
+      @e.none? {|e| e == 3 ? true : false }.should == false
     end
 
     it "does not hide exceptions out of the block" do
       -> {
         @enum.none? { raise "from block" }
-      }.should raise_error(RuntimeError)
+      }.should.raise(RuntimeError)
     end
 
     it "gathers initial args as elements when each yields multiple" do
@@ -102,66 +93,61 @@ describe "Enumerable#none?" 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 == 3 }
-        @enum1.none?(pattern).should == true
-        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.none?(Integer) { raise }.should == true
-          [1, 2, nil].none?(TrueClass) { raise }.should == true
-          {a: 1}.none?(Hash) { raise }.should == true
-        end
-      end
-
-      it "always returns true on empty enumeration" do
-        @empty.none?(Integer).should == true
-        [].none?(Integer).should == true
-        {}.none?(NilClass).should == true
-      end
-
-      it "does not hide exceptions out of #each" do
-        -> {
-          EnumerableSpecs::ThrowingEach.new.none?(Integer)
-        }.should raise_error(RuntimeError)
-      end
-
-      it "returns true if the pattern never returns a truthy value" do
-        @enum2.none?(Integer).should == true
-        pattern = EnumerableSpecs::Pattern.new { |x| nil }
-        @enum.none?(pattern).should == true
-
-        [1, 42, 3].none?(pattern).should == true
-        {a: 1, b: 2}.none?(pattern).should == true
-      end
-
-      it "returns false if the pattern ever returns other than false or nil" do
-        pattern = EnumerableSpecs::Pattern.new { |x| x < 0 }
-        @enum1.none?(pattern).should == false
-        pattern.yielded.should == [[0], [1], [2], [-1]]
-
-        [1, 2, 3, -1].none?(pattern).should == false
-        {a: 1}.none?(Array).should == false
-      end
-
-      it "does not hide exceptions out of pattern#===" do
-        pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
-        -> {
-          @enum.none?(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 { false }
-        multi.none?(pattern).should == true
-        pattern.yielded.should == [[[1, 2]], [[3, 4, 5]], [[6, 7, 8, 9]]]
-      end
+  describe 'when given a pattern argument' do
+    it "calls `===` on the pattern the return value" do
+      pattern = EnumerableSpecs::Pattern.new { |x| x == 3 }
+      @enum1.none?(pattern).should == true
+      pattern.yielded.should == [[0], [1], [2], [-1]]
+    end
+
+    it "always returns true on empty enumeration" do
+      @empty.none?(Integer).should == true
+      [].none?(Integer).should == true
+      {}.none?(NilClass).should == true
+    end
+
+    it "does not hide exceptions out of #each" do
+      -> {
+        EnumerableSpecs::ThrowingEach.new.none?(Integer)
+      }.should.raise(RuntimeError)
+    end
+
+    it "returns true if the pattern never returns a truthy value" do
+      @enum2.none?(Integer).should == true
+      pattern = EnumerableSpecs::Pattern.new { |x| nil }
+      @enum.none?(pattern).should == true
+
+      [1, 42, 3].none?(pattern).should == true
+      {a: 1, b: 2}.none?(pattern).should == true
+    end
+
+    it "returns false if the pattern ever returns other than false or nil" do
+      pattern = EnumerableSpecs::Pattern.new { |x| x < 0 }
+      @enum1.none?(pattern).should == false
+      pattern.yielded.should == [[0], [1], [2], [-1]]
+
+      [1, 2, 3, -1].none?(pattern).should == false
+      {a: 1}.none?(Array).should == false
+    end
+
+    it "does not hide exceptions out of pattern#===" do
+      pattern = EnumerableSpecs::Pattern.new { raise "from pattern" }
+      -> {
+        @enum.none?(pattern)
+      }.should.raise(RuntimeError)
+    end
+
+    it "calls the pattern with gathered array when yielded with multiple arguments" do
+      multi = EnumerableSpecs::YieldsMulti.new
+      pattern = EnumerableSpecs::Pattern.new { false }
+      multi.none?(pattern).should == true
+      pattern.yielded.should == [[[1, 2]], [[3, 4, 5]], [[6, 7, 8, 9]]]
+    end
+
+    it "ignores the block if there is an argument" do
+      -> {
+        EnumerableSpecs::Numerous.new(1, 2, 3, 4, 5).none?(String) { true }.should == true
+      }.should complain(/given block not used/)
     end
   end
 end