From e28eb3d8b1a98dae7f45046a475875d4c7953961 Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 7 Oct 2021 10:12:35 +0200 Subject: [PATCH 1/2] replace fix values --- core/dir/shared/glob.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/core/dir/shared/glob.rb b/core/dir/shared/glob.rb index d2824df446..c54f2665be 100644 --- a/core/dir/shared/glob.rb +++ b/core/dir/shared/glob.rb @@ -38,6 +38,23 @@ end end + ruby_version_is "3.0" do + 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 "sorted: false returns same files" do + result = Dir.send(@method,'*', sort: false) + result.sort.should == Dir.send(@method, '*').sort + end + end + it "matches non-dotfiles with '*'" do expected = %w[ brace From ec5408409d3676cc11ec6ca15992b24bcdb8b83b Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 8 Oct 2021 12:31:38 +0200 Subject: [PATCH 2/2] Update core/dir/shared/glob.rb --- core/dir/shared/glob.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dir/shared/glob.rb b/core/dir/shared/glob.rb index c54f2665be..173038ee24 100644 --- a/core/dir/shared/glob.rb +++ b/core/dir/shared/glob.rb @@ -49,7 +49,7 @@ result.should == result.sort end - it "sorted: false returns same files" do + it "sort: false returns same files" do result = Dir.send(@method,'*', sort: false) result.sort.should == Dir.send(@method, '*').sort end