aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-27 08:40:40 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-27 08:40:40 +0000
commitdeaead87d0378ffbd26f236e11063c6fab5055d3 (patch)
tree141815125461f7534900695d60736953337ce545 /spec
parentfce371fcf00bfdb15786dd32a6c3a0f887ff4942 (diff)
downloadruby-deaead87d0378ffbd26f236e11063c6fab5055d3.tar.gz
Revert "Dir.glob with FNM_EXTGLOB is optimized [Feature #13873]"
This reverts commit r60341,r60342,r60344,r60345. Breaking compabitility of the order of result breaks many tests. To avoid such effort to fix tests, the order should be kept. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r--spec/ruby/core/dir/shared/glob.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index 11ace13326..d2201cd6cd 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -221,12 +221,12 @@ describe :dir_glob, shared: true do
it "respects the order of {} expressions, expanding left most first" do
files = Dir.send(@method, "brace/a{.js,.html}{.erb,.rjs}")
- files.sort.should == %w!brace/a.html.erb brace/a.js.rjs!
+ files.should == %w!brace/a.js.rjs brace/a.html.erb!
end
it "respects the optional nested {} expressions" do
files = Dir.send(@method, "brace/a{.{js,html},}{.{erb,rjs},}")
- files.sort.should == %w!brace/a brace/a.erb brace/a.html.erb brace/a.js brace/a.js.rjs!
+ files.should == %w!brace/a.js.rjs brace/a.js brace/a.html.erb brace/a.erb brace/a!
end
it "matches special characters by escaping with a backslash with '\\<character>'" do