1 files changed, 49 insertions, 10 deletions
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index ae5c2a114b..745f02d46b 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -12,7 +12,7 @@ describe :dir_glob, shared: true do
   end
 
   it "raises an Encoding::CompatibilityError if the argument encoding is not compatible with US-ASCII" do
-    pattern = "file*".force_encoding Encoding::UTF_16BE
+    pattern = "file*".dup.force_encoding Encoding::UTF_16BE
     -> { Dir.send(@method, pattern) }.should raise_error(Encoding::CompatibilityError)
   end
 
@@ -23,18 +23,43 @@ describe :dir_glob, shared: true do
     Dir.send(@method, obj).should == %w[file_one.ext]
   end
 
-  ruby_version_is ""..."2.7" 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/)
+  it "raises an ArgumentError if the string contains \\0" do
+    -> {Dir.send(@method, "file_o*\0file_t*")}.should raise_error ArgumentError, /nul-separated/
+  end
+
+  it "result is sorted by default" do
+    result = Dir.send(@method, '*')
+    result.should == result.sort
+  end
+
+  it "result is sorted with sort: true" do
+    result = Dir.send(@method, '*', sort: true)
+    result.should == result.sort
+  end
+
+  it "sort: false returns same files" do
+    result = Dir.send(@method,'*', sort: false)
+    result.sort.should == Dir.send(@method, '*').sort
+  end
+
+  ruby_version_is ""..."3.1" do
+    it "result is sorted with any non false value of sort:" do
+      result = Dir.send(@method, '*', sort: 0)
+      result.should == result.sort
+
+      result = Dir.send(@method, '*', sort: nil)
+      result.should == result.sort
+
+      result = Dir.send(@method, '*', sort: 'false')
+      result.should == result.sort
     end
   end
 
-  ruby_version_is "2.7" do
-    it "raises an ArgumentError if the string contains \\0" do
-      -> {Dir.send(@method, "file_o*\0file_t*")}.should raise_error ArgumentError, /nul-separated/
+  ruby_version_is "3.1" do
+    it "raises an ArgumentError if sort: is not true or false" do
+      -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
+      -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
+      -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
     end
   end
 
@@ -64,6 +89,10 @@ describe :dir_glob, shared: true do
     Dir.send(@method, 'special/+').should == ['special/+']
   end
 
+  it "matches directories with special characters when escaped" do
+    Dir.send(@method, 'special/\{}/special').should == ["special/{}/special"]
+  end
+
   platform_is_not :windows do
     it "matches regexp special *" do
       Dir.send(@method, 'special/\*').should == ['special/*']
@@ -76,6 +105,14 @@ describe :dir_glob, shared: true do
     it "matches regexp special |" do
       Dir.send(@method, 'special/|').should == ['special/|']
     end
+
+    it "matches files with backslashes in their name" do
+      Dir.glob('special/\\\\{a,b}').should == ['special/\a']
+    end
+
+    it "matches directory with special characters in their name in complex patterns" do
+      Dir.glob("special/test +()\\[\\]\\{\\}/hello_world{.{en},}{.{html},}{+{phone},}{.{erb},}").should == ['special/test +()[]{}/hello_world.erb']
+    end
   end
 
   it "matches regexp special ^" do
@@ -190,7 +227,9 @@ describe :dir_glob, shared: true do
       dir/
       nested/
       special/
+      special/test\ +()[]{}/
       special/test{1}/
+      special/{}/
       subdir_one/
       subdir_two/
     ]