2 files changed, 14 insertions, 15 deletions
diff --git a/spec/ruby/core/dir/close_spec.rb b/spec/ruby/core/dir/close_spec.rb
index 1cf1f1d029..64d87140ae 100644
--- a/spec/ruby/core/dir/close_spec.rb
+++ b/spec/ruby/core/dir/close_spec.rb
@@ -1,9 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/common'
-ruby_version_is ''...'2.3' do
-  require_relative 'shared/closed'
-end
-
 describe "Dir#close" do
   before :all do
     DirSpecs.create_mock_dirs
@@ -13,17 +9,11 @@ describe "Dir#close" do
     DirSpecs.delete_mock_dirs
   end
 
-  ruby_version_is ''...'2.3' do
-    it_behaves_like :dir_closed, :close
-  end
-
-  ruby_version_is '2.3' do
-    it "does not raise an IOError even if the Dir instance is closed" do
-      dir = Dir.open DirSpecs.mock_dir
+  it "does not raise an IOError even if the Dir instance is closed" do
+    dir = Dir.open DirSpecs.mock_dir
+    dir.close
+    lambda {
       dir.close
-      lambda {
-        dir.close
-      }.should_not raise_error(IOError)
-    end
+    }.should_not raise_error(IOError)
   end
 end
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index 2fe22ac6c3..88ceb82c50 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -32,6 +32,15 @@ describe :dir_glob, shared: true do
     end
   end
 
+  ruby_version_is "2.6" do
+    it "splits the string on \\0 if there is only one string given and warns" do
+      -> {
+        Dir.send(@method, "file_o*\0file_t*").should ==
+          %w!file_one.ext file_two.ext!
+      }.should complain(/warning: use glob patterns list instead of nul-separated patterns/)
+    end
+  end
+
   it "matches non-dotfiles with '*'" do
     expected = %w[
       brace