1 files changed, 68 insertions, 57 deletions
diff --git a/spec/ruby/core/dir/children_spec.rb b/spec/ruby/core/dir/children_spec.rb
index e0325a24b8..6e6da1dd44 100644
--- a/spec/ruby/core/dir/children_spec.rb
+++ b/spec/ruby/core/dir/children_spec.rb
@@ -47,90 +47,101 @@ describe "Dir.children" do
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".force_encoding(encoding))
+      children.should.include?("こんにちは.txt".dup.force_encoding(encoding))
     end
-    children.first.encoding.should equal(Encoding.find("filesystem"))
+    children.first.encoding.should.equal?(Encoding.find("filesystem"))
   end
 
   it "returns children encoded with the specified encoding" do
     dir = File.join(DirSpecs.mock_dir, 'special')
     children = Dir.children(dir, encoding: "euc-jp").sort
-    children.first.encoding.should equal(Encoding::EUC_JP)
+    children.first.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "returns children transcoded to the default internal encoding" do
     Encoding.default_internal = Encoding::EUC_KR
     children = Dir.children(File.join(DirSpecs.mock_dir, 'special')).sort
-    children.first.encoding.should equal(Encoding::EUC_KR)
+    children.first.encoding.should.equal?(Encoding::EUC_KR)
   end
 
   it "raises a SystemCallError if called with a nonexistent directory" do
-    -> { Dir.children DirSpecs.nonexistent }.should raise_error(SystemCallError)
+    -> { Dir.children DirSpecs.nonexistent }.should.raise(SystemCallError)
   end
 end
 
-ruby_version_is "2.6" do
-  describe "Dir#children" do
-    before :all do
-      DirSpecs.create_mock_dirs
-    end
+describe "Dir#children" do
+  before :all do
+    DirSpecs.create_mock_dirs
+  end
 
-    before :each do
-      @internal = Encoding.default_internal
-    end
+  before :each do
+    @internal = Encoding.default_internal
+  end
 
-    after :all do
-      DirSpecs.delete_mock_dirs
-    end
+  after :all do
+    DirSpecs.delete_mock_dirs
+  end
 
-    after :each do
-      Encoding.default_internal = @internal
-      @dir.close if @dir
-    end
+  after :each do
+    Encoding.default_internal = @internal
+    @dir.close if @dir
+  end
 
-    it "returns an Array of filenames in an existing directory including dotfiles" do
-      @dir = Dir.new(DirSpecs.mock_dir)
-      a = @dir.children.sort
-      @dir.close
+  it "returns an Array of filenames in an existing directory including dotfiles" do
+    @dir = Dir.new(DirSpecs.mock_dir)
+    a = @dir.children.sort
+    @dir.close
 
-      a.should == DirSpecs.expected_paths - %w[. ..]
+    a.should == DirSpecs.expected_paths - %w[. ..]
 
-      @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested")
-      a = @dir.children.sort
-      a.should == %w|.dotfile.ext directory|
-    end
+    @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested")
+    a = @dir.children.sort
+    a.should == %w|.dotfile.ext directory|
+  end
 
-    it "accepts an options Hash" do
-      @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8")
-      a = @dir.children.sort
-      a.should == %w|.dotfile.ext directory|
-    end
+  it "accepts an encoding keyword for the encoding of the entries" do
+    @dir = Dir.new("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8")
+    dirs = @dir.to_a.sort
+    dirs.each { |d| d.encoding.should == Encoding::UTF_8 }
+  end
 
-    it "returns children encoded with the filesystem encoding by default" do
-      # This spec depends on the locale not being US-ASCII because if it is, the
-      # children that are not ascii_only? will be BINARY encoded.
-      @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
-      children = @dir.children.sort
-      encoding = Encoding.find("filesystem")
-      encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
-      platform_is_not :windows do
-        children.should include("こんにちは.txt".force_encoding(encoding))
-      end
-      children.first.encoding.should equal(Encoding.find("filesystem"))
+  it "returns children encoded with the filesystem encoding by default" do
+    # This spec depends on the locale not being US-ASCII because if it is, the
+    # children that are not ascii_only? will be BINARY encoded.
+    @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
+    children = @dir.children.sort
+    encoding = Encoding.find("filesystem")
+    encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
+    platform_is_not :windows do
+      children.should.include?("こんにちは.txt".dup.force_encoding(encoding))
     end
+    children.first.encoding.should.equal?(Encoding.find("filesystem"))
+  end
 
-    it "returns children encoded with the specified encoding" do
-      path = File.join(DirSpecs.mock_dir, 'special')
-      @dir = Dir.new(path, encoding: "euc-jp")
-      children = @dir.children.sort
-      children.first.encoding.should equal(Encoding::EUC_JP)
-    end
+  it "returns children encoded with the specified encoding" do
+    path = File.join(DirSpecs.mock_dir, 'special')
+    @dir = Dir.new(path, encoding: "euc-jp")
+    children = @dir.children.sort
+    children.first.encoding.should.equal?(Encoding::EUC_JP)
+  end
 
-    it "returns children transcoded to the default internal encoding" do
-      Encoding.default_internal = Encoding::EUC_KR
-      @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
-      children = @dir.children.sort
-      children.first.encoding.should equal(Encoding::EUC_KR)
-    end
+  it "returns children transcoded to the default internal encoding" do
+    Encoding.default_internal = Encoding::EUC_KR
+    @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
+    children = @dir.children.sort
+    children.first.encoding.should.equal?(Encoding::EUC_KR)
+  end
+
+  it "returns the same result when called repeatedly" do
+    @dir = Dir.open DirSpecs.mock_dir
+
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
   end
 end