Update to ruby/spec@15c9619

2 files changed, 22 insertions, 37 deletions

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