1 files changed, 38 insertions, 4 deletions
diff --git a/spec/ruby/core/dir/close_spec.rb b/spec/ruby/core/dir/close_spec.rb
index 5fad5eecfb..9902d98934 100644
--- a/spec/ruby/core/dir/close_spec.rb
+++ b/spec/ruby/core/dir/close_spec.rb
@@ -11,9 +11,43 @@ describe "Dir#close" do
 
   it "does not raise an IOError even if the Dir instance is closed" do
     dir = Dir.open DirSpecs.mock_dir
-    dir.close
-    -> {
-      dir.close
-    }.should_not raise_error(IOError)
+    dir.close.should == nil
+    dir.close.should == nil
+
+    platform_is_not :windows do
+      -> { dir.fileno }.should.raise(IOError, /closed directory/)
+    end
+  end
+
+  it "returns nil" do
+    dir = Dir.open DirSpecs.mock_dir
+    dir.close.should == nil
+  end
+
+  ruby_version_is ''...'3.4' do
+    platform_is_not :windows do
+      it "does not raise an error even if the file descriptor is closed with another Dir instance" do
+        dir = Dir.open DirSpecs.mock_dir
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir.close
+        dir_new.close
+
+        -> { dir.fileno }.should.raise(IOError, /closed directory/)
+        -> { dir_new.fileno }.should.raise(IOError, /closed directory/)
+      end
+    end
+  end
+
+  ruby_version_is '3.4' do
+    platform_is_not :windows do
+      it "raises an error if the file descriptor is closed with another Dir instance" do
+        dir = Dir.open DirSpecs.mock_dir
+        dir_new = Dir.for_fd(dir.fileno)
+        dir.close
+
+        -> { dir_new.close }.should.raise(Errno::EBADF, 'Bad file descriptor - closedir')
+      end
+    end
   end
 end