Update to ruby/spec@35a9fba

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 118 insertions, 0 deletions

diff --git a/spec/ruby/core/dir/children_spec.rb b/spec/ruby/core/dir/children_spec.rb
index 4bc64934b3..c6329b416f 100644
--- a/spec/ruby/core/dir/children_spec.rb
+++ b/spec/ruby/core/dir/children_spec.rb
@@ -70,3 +70,69 @@ ruby_version_is "2.5" do
     end
   end
 end
+
+ruby_version_is "2.6" do
+  describe "Dir#children" do
+    before :all do
+      DirSpecs.create_mock_dirs
+    end
+
+    before :each do
+      @internal = Encoding.default_internal
+    end
+
+    after :all do
+      DirSpecs.delete_mock_dirs
+    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
+
+      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
+
+    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 "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 ASCII-8BIT encoded.
+      @dir = Dir.new(File.join(DirSpecs.mock_dir, 'special'))
+      children = @dir.children.sort
+      encoding = Encoding.find("filesystem")
+      encoding = Encoding::ASCII_8BIT 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"))
+    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
+  end
+end
diff --git a/spec/ruby/core/dir/each_child_spec.rb b/spec/ruby/core/dir/each_child_spec.rb
index 913b9cb96f..c04d212bfa 100644
--- a/spec/ruby/core/dir/each_child_spec.rb
+++ b/spec/ruby/core/dir/each_child_spec.rb
@@ -51,3 +51,55 @@ ruby_version_is "2.5" do
     end
   end
 end
+
+ruby_version_is "2.6" do
+  describe "Dir#each_child" do
+    before :all do
+      DirSpecs.create_mock_dirs
+    end
+
+    after :all do
+      DirSpecs.delete_mock_dirs
+    end
+
+    after :each do
+      @dir.close if @dir
+    end
+
+    it "yields all names in an existing directory to the provided block" do
+      a, b = [], []
+      @dir = Dir.new(DirSpecs.mock_dir)
+      @dir2 = Dir.new("#{DirSpecs.mock_dir}/deeply/nested")
+
+      @dir.each_child { |f| a << f }
+      @dir2.each_child { |f| b << f }
+      @dir2.close
+
+      a.sort.should == DirSpecs.expected_paths - %w|. ..|
+      b.sort.should == %w|.dotfile.ext directory|
+    end
+
+    it "returns self when successful" do
+      @dir = Dir.new(DirSpecs.mock_dir)
+      @dir.each_child { |f| f }.should == @dir
+    end
+
+    describe "when no block is given" do
+      it "returns an Enumerator" do
+        @dir = Dir.new(DirSpecs.mock_dir)
+
+        @dir.each_child.should be_an_instance_of(Enumerator)
+        @dir.each_child.to_a.sort.should == DirSpecs.expected_paths - %w|. ..|
+      end
+
+      describe "returned Enumerator" do
+        describe "size" do
+          it "should return nil" do
+            @dir = Dir.new(DirSpecs.mock_dir)
+            @dir.each_child.size.should == nil
+          end
+        end
+      end
+    end
+  end
+end