Update to ruby/spec@b1e93a2

3 files changed, 8 insertions, 0 deletions

diff --git a/spec/ruby/core/dir/fixtures/common.rb b/spec/ruby/core/dir/fixtures/common.rb
index a1ea3db215..1a197d7a97 100644
--- a/spec/ruby/core/dir/fixtures/common.rb
+++ b/spec/ruby/core/dir/fixtures/common.rb
@@ -81,6 +81,7 @@ module DirSpecs
         special/}
 
         special/test{1}/file[1]
+        special/{}/special
       ]
 
       platform_is_not :windows do
diff --git a/spec/ruby/core/dir/glob_spec.rb b/spec/ruby/core/dir/glob_spec.rb
index 6533c9b65a..295a7ab920 100644
--- a/spec/ruby/core/dir/glob_spec.rb
+++ b/spec/ruby/core/dir/glob_spec.rb
@@ -80,6 +80,7 @@ describe "Dir.glob" do
       nested/.dotsubir/
       special/
       special/test{1}/
+      special/{}/
       subdir_one/
       subdir_two/
     ]
@@ -130,6 +131,7 @@ describe "Dir.glob" do
       ./nested/.dotsubir/
       ./special/
       ./special/test{1}/
+      ./special/{}/
       ./subdir_one/
       ./subdir_two/
     ]
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index ae5c2a114b..89d6b90283 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -64,6 +64,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/*']
@@ -191,6 +195,7 @@ describe :dir_glob, shared: true do
       nested/
       special/
       special/test{1}/
+      special/{}/
       subdir_one/
       subdir_two/
     ]