0
@@ -43,6 +43,9 @@ module DirSpecs
0
                 #{mock_dir}/file_one.ext
0
                 #{mock_dir}/file_two.ext
0
 
0
+                #{mock_dir}/dir_filename_ordering
0
+                #{mock_dir}/dir/filename_ordering
0
+
0
                 #{mock_dir}/nondotfile
0
 
0
                 #{mock_dir}/subdir_one/.dotfile
0
@@ -86,6 +89,8 @@ module DirSpecs
0
       .dotfile
0
       .dotsubdir
0
       deeply
0
+      dir
0
+      dir_filename_ordering
0
       file_one.ext
0
       file_two.ext
0
       nondotfile

0
@@ -30,6 +30,7 @@ describe "Dir.glob" do
0
       deeply/nested/
0
       deeply/nested/directory/
0
       deeply/nested/directory/structure/
0
+      dir/
0
       special/
0
       subdir_one/
0
       subdir_two/

0
@@ -9,6 +9,8 @@ shared :dir_glob do |cmd|
0
     it "matches non-dotfiles with '*'" do
0
       expected = %w[
0
         deeply
0
+        dir
0
+        dir_filename_ordering
0
         file_one.ext
0
         file_two.ext
0
         nondotfile
0
@@ -95,12 +97,14 @@ shared :dir_glob do |cmd|
0
     end
0
 
0
     it "matches files with multiple '*' special characters" do
0
-      Dir.send(cmd, '*fi*e*').sort.should == %w|nondotfile file_one.ext file_two.ext|.sort
0
+      Dir.send(cmd, '*fi*e*').sort.should == %w|dir_filename_ordering nondotfile file_one.ext file_two.ext|.sort
0
     end
0
 
0
     it "matches non-dotfiles in the current directory with '**'" do
0
       expected = %w[
0
         deeply
0
+        dir
0
+        dir_filename_ordering
0
         file_one.ext
0
         file_two.ext
0
         nondotfile
0
@@ -122,6 +126,7 @@ shared :dir_glob do |cmd|
0
         deeply/nested/
0
         deeply/nested/directory/
0
         deeply/nested/directory/structure/
0
+        dir/
0
         special/
0
         subdir_one/
0
         subdir_two/
0
@@ -188,14 +193,26 @@ shared :dir_glob do |cmd|
0
 
0
     it "recursively matches directories with '**/<characters>'" do
0
       %w|glob []|.each {|cmd|
0
-        Dir.send(cmd, '**/*fil?{,.}*').sort.should == %w|deeply/nested/directory/structure/file_one 
0
-                                                         deeply/nested/directory/structure/file_one.ext 
0
-                                                         deeply/nondotfile file_one.ext file_two.ext 
0
-                                                         nondotfile subdir_one/nondotfile 
0
-                                                         subdir_two/nondotfile subdir_two/nondotfile.ext 
0
+        Dir.send(cmd, '**/*fil?{,.}*').sort.should == %w|deeply/nested/directory/structure/file_one
0
+                                                         deeply/nested/directory/structure/file_one.ext
0
+                                                         deeply/nondotfile
0
+                                                         dir/filename_ordering
0
+                                                         dir_filename_ordering
0
+                                                         file_one.ext file_two.ext
0
+                                                         nondotfile subdir_one/nondotfile
0
+                                                         subdir_two/nondotfile
0
+                                                         subdir_two/nondotfile.ext
0
                                                          subdir_two/nondotfile.ext|
0
       }
0
     end
0
+
0
+    it "orders directory-based entries before files when a glob matches both" do
0
+      expected = %w[dir/filename_ordering dir_filename_ordering]
0
+      %w|glob []|.each do |cmd|
0
+        Dir.send(cmd, '**/*filename_ordering').should == expected
0
+      end
0
+    end
0
+
0
     after(:all) do
0
       Dir.chdir @cwd
0
     end