4 files changed, 28 insertions, 16 deletions
diff --git a/spec/ruby/core/enumerable/all_spec.rb b/spec/ruby/core/enumerable/all_spec.rb
index b0edb14532..bd87a361d4 100644
--- a/spec/ruby/core/enumerable/all_spec.rb
+++ b/spec/ruby/core/enumerable/all_spec.rb
@@ -142,10 +142,13 @@ describe "Enumerable#all?" do
         pattern.yielded.should == [[0], [1], [2], [-1]]
       end
 
-      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
+      # 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
diff --git a/spec/ruby/core/enumerable/any_spec.rb b/spec/ruby/core/enumerable/any_spec.rb
index a4e98df736..b3f10d6806 100644
--- a/spec/ruby/core/enumerable/any_spec.rb
+++ b/spec/ruby/core/enumerable/any_spec.rb
@@ -155,10 +155,13 @@ describe "Enumerable#any?" do
         pattern.yielded.should == [[0], [1], [2]]
       end
 
-      it "ignores block" do
-        @enum2.any?(NilClass) { raise }.should == true
-        [1, 2, nil].any?(NilClass) { raise }.should == true
-        {a: 1}.any?(Array) { raise }.should == true
+      # may raise an exception in future versions
+      ruby_version_is ""..."2.6" do
+        it "ignores block" do
+          @enum2.any?(NilClass) { raise }.should == true
+          [1, 2, nil].any?(NilClass) { raise }.should == true
+          {a: 1}.any?(Array) { raise }.should == true
+        end
       end
 
       it "always returns false on empty enumeration" do
diff --git a/spec/ruby/core/enumerable/none_spec.rb b/spec/ruby/core/enumerable/none_spec.rb
index 04fb64e089..99fbb24a95 100644
--- a/spec/ruby/core/enumerable/none_spec.rb
+++ b/spec/ruby/core/enumerable/none_spec.rb
@@ -111,10 +111,13 @@ describe "Enumerable#none?" do
         pattern.yielded.should == [[0], [1], [2], [-1]]
       end
 
-      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
+      # 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
diff --git a/spec/ruby/core/enumerable/one_spec.rb b/spec/ruby/core/enumerable/one_spec.rb
index 67653749dd..d3ff42890f 100644
--- a/spec/ruby/core/enumerable/one_spec.rb
+++ b/spec/ruby/core/enumerable/one_spec.rb
@@ -102,10 +102,13 @@ describe "Enumerable#one?" do
         pattern.yielded.should == [[0], [1], [2], [-1]]
       end
 
-      it "ignores block" do
-        @enum2.one?(NilClass) { raise }.should == true
-        [1, 2, nil].one?(NilClass) { raise }.should == true
-        {a: 1}.one?(Array) { raise }.should == true
+      # may raise an exception in future versions
+      ruby_version_is ""..."2.6" do
+        it "ignores block" do
+          @enum2.one?(NilClass) { raise }.should == true
+          [1, 2, nil].one?(NilClass) { raise }.should == true
+          {a: 1}.one?(Array) { raise }.should == true
+        end
       end
 
       it "always returns false on empty enumeration" do