Update to ruby/spec@15c9619

6 files changed, 45 insertions, 70 deletions

diff --git a/spec/ruby/core/kernel/Complex_spec.rb b/spec/ruby/core/kernel/Complex_spec.rb
index e5435a56e6..cb90718759 100644
--- a/spec/ruby/core/kernel/Complex_spec.rb
+++ b/spec/ruby/core/kernel/Complex_spec.rb
@@ -175,13 +175,11 @@ describe "Kernel.Complex()" do
         end
       end
 
-      ruby_bug "#15525", "2.6"..."2.6.1" do
-        describe "and nil arguments" do
-          it "swallows an error" do
-            Complex(nil, exception: false).should == nil
-            Complex(0, nil, exception: false).should == nil
-            Complex(nil, 0, exception: false).should == nil
-          end
+      describe "and nil arguments" do
+        it "swallows an error" do
+          Complex(nil, exception: false).should == nil
+          Complex(0, nil, exception: false).should == nil
+          Complex(nil, 0, exception: false).should == nil
         end
       end
     end
diff --git a/spec/ruby/core/kernel/Integer_spec.rb b/spec/ruby/core/kernel/Integer_spec.rb
index 72e33fc737..b7e05e701b 100644
--- a/spec/ruby/core/kernel/Integer_spec.rb
+++ b/spec/ruby/core/kernel/Integer_spec.rb
@@ -125,17 +125,15 @@ describe :kernel_integer, shared: true do
         end
       end
 
-      ruby_bug "#15525", "2.6"..."2.6.1" do
-        describe "and passed NaN" do
-          it "swallows an error" do
-            Integer(nan_value, exception: false).should == nil
-          end
+      describe "and passed NaN" do
+        it "swallows an error" do
+          Integer(nan_value, exception: false).should == nil
         end
+      end
 
-        describe "and passed Infinity" do
-          it "swallows an error" do
-            Integer(infinity_value, exception: false).should == nil
-          end
+      describe "and passed Infinity" do
+        it "swallows an error" do
+          Integer(infinity_value, exception: false).should == nil
         end
       end
 
diff --git a/spec/ruby/core/kernel/clone_spec.rb b/spec/ruby/core/kernel/clone_spec.rb
index ed426c2927..eb8739d571 100644
--- a/spec/ruby/core/kernel/clone_spec.rb
+++ b/spec/ruby/core/kernel/clone_spec.rb
@@ -37,14 +37,12 @@ describe "Kernel#clone" do
     o3.frozen?.should == true
   end
 
-  ruby_version_is '2.4' do
-    it 'takes an option to copy freeze state or not' do
-      @obj.clone(freeze: true).frozen?.should == false
-      @obj.clone(freeze: false).frozen?.should == false
-      @obj.freeze
-      @obj.clone(freeze: true).frozen?.should == true
-      @obj.clone(freeze: false).frozen?.should == false
-    end
+  it 'takes an option to copy freeze state or not' do
+    @obj.clone(freeze: true).frozen?.should == false
+    @obj.clone(freeze: false).frozen?.should == false
+    @obj.freeze
+    @obj.clone(freeze: true).frozen?.should == true
+    @obj.clone(freeze: false).frozen?.should == false
   end
 
   it "copies instance variables" do
diff --git a/spec/ruby/core/kernel/shared/dup_clone.rb b/spec/ruby/core/kernel/shared/dup_clone.rb
index 116989958b..37890f2981 100644
--- a/spec/ruby/core/kernel/shared/dup_clone.rb
+++ b/spec/ruby/core/kernel/shared/dup_clone.rb
@@ -79,48 +79,24 @@ describe :kernel_dup_clone, shared: true do
     o3.untrusted?.should == true
   end
 
-  ruby_version_is ''...'2.4' do
-    it "raises a TypeError for NilClass" do
-      lambda { nil.send(@method) }.should raise_error(TypeError)
-    end
-
-    it "raises a TypeError for TrueClass" do
-      lambda { true.send(@method) }.should raise_error(TypeError)
-    end
-
-    it "raises a TypeError for FalseClass" do
-      lambda { false.send(@method) }.should raise_error(TypeError)
-    end
-
-    it "raises a TypeError for Fixnum" do
-      lambda { 1.send(@method) }.should raise_error(TypeError)
-    end
-
-    it "raises a TypeError for Symbol" do
-      lambda { :my_symbol.send(@method) }.should raise_error(TypeError)
-    end
+  it "returns nil for NilClass" do
+    nil.send(@method).should == nil
   end
 
-  ruby_version_is '2.4' do
-    it "returns nil for NilClass" do
-      nil.send(@method).should == nil
-    end
-
-    it "returns true for TrueClass" do
-      true.send(@method).should == true
-    end
+  it "returns true for TrueClass" do
+    true.send(@method).should == true
+  end
 
-    it "returns false for FalseClass" do
-      false.send(@method).should == false
-    end
+  it "returns false for FalseClass" do
+    false.send(@method).should == false
+  end
 
-    it "returns the same Integer for Integer" do
-      1.send(@method).should == 1
-    end
+  it "returns the same Integer for Integer" do
+    1.send(@method).should == 1
+  end
 
-    it "returns the same Symbol for Symbol" do
-      :my_symbol.send(@method).should == :my_symbol
-    end
+  it "returns the same Symbol for Symbol" do
+    :my_symbol.send(@method).should == :my_symbol
   end
 
   ruby_version_is ''...'2.5' do
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index b502476bc3..56377684fb 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -553,6 +553,15 @@ describe :kernel_require, shared: true do
         required = ruby_exe(code, options: '--disable-gems')
         required.should == "false\n" * provided.size
       end
+
+      it "unicode_normalize is part of core and not $LOADED_FEATURES" do
+        features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
+        features.lines.each { |feature|
+          feature.should_not include("unicode_normalize")
+        }
+
+        -> { @object.require("unicode_normalize") }.should raise_error(LoadError)
+      end
     end
   end
 
diff --git a/spec/ruby/core/kernel/warn_spec.rb b/spec/ruby/core/kernel/warn_spec.rb
index 0b461ec25a..7e0a57fa9a 100644
--- a/spec/ruby/core/kernel/warn_spec.rb
+++ b/spec/ruby/core/kernel/warn_spec.rb
@@ -101,11 +101,9 @@ describe "Kernel#warn" do
         -> { w.f4("foo", 3) }.should output(nil, %r|core/kernel/fixtures/classes.rb:#{w.f3_call_lineno}: warning: foo|)
       end
 
-      ruby_bug "#14846", "2.5"..."2.6" do
-        it "does not prepend caller information if line number is too big" do
-          w = KernelSpecs::WarnInNestedCall.new
-          -> { w.f4("foo", 100) }.should output(nil, "warning: foo\n")
-        end
+      it "does not prepend caller information if line number is too big" do
+        w = KernelSpecs::WarnInNestedCall.new
+        -> { w.f4("foo", 100) }.should output(nil, "warning: foo\n")
       end
 
       it "prepends even if a message is empty or nil" do
@@ -127,10 +125,8 @@ describe "Kernel#warn" do
         -> { warn "", uplevel: -100 }.should raise_error(ArgumentError)
       end
 
-      ruby_bug "#14846", "2.5"..."2.6" do
-        it "raises ArgumentError if passed -1" do
-          -> { warn "", uplevel: -1 }.should raise_error(ArgumentError)
-        end
+      it "raises ArgumentError if passed -1" do
+        -> { warn "", uplevel: -1 }.should raise_error(ArgumentError)
       end
 
       it "raises TypeError if passed not Integer" do