1 files changed, 11 insertions, 11 deletions
diff --git a/spec/ruby/core/dir/entries_spec.rb b/spec/ruby/core/dir/entries_spec.rb
index 42f89a1623..f3ca49b26d 100644
--- a/spec/ruby/core/dir/entries_spec.rb
+++ b/spec/ruby/core/dir/entries_spec.rb
@@ -35,36 +35,36 @@ describe "Dir.entries" do
     Dir.entries(p)
   end
 
-  it "accepts an options Hash" do
-    a = Dir.entries("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8").sort
-    a.should == %w|. .. .dotfile.ext directory|
+  it "accepts an encoding keyword for the encoding of the entries" do
+    dirs = Dir.entries("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8").to_a.sort
+    dirs.each {|dir| dir.encoding.should == Encoding::UTF_8}
   end
 
   it "returns entries encoded with the filesystem encoding by default" do
     # This spec depends on the locale not being US-ASCII because if it is, the
-    # entries that are not ascii_only? will be ASCII-8BIT encoded.
+    # entries that are not ascii_only? will be BINARY encoded.
     entries = Dir.entries(File.join(DirSpecs.mock_dir, 'special')).sort
     encoding = Encoding.find("filesystem")
-    encoding = Encoding::ASCII_8BIT if encoding == Encoding::US_ASCII
+    encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      entries.should include("こんにちは.txt".force_encoding(encoding))
+      entries.should.include?("こんにちは.txt".dup.force_encoding(encoding))
     end
-    entries.first.encoding.should equal(Encoding.find("filesystem"))
+    entries.first.encoding.should.equal?(Encoding.find("filesystem"))
   end
 
   it "returns entries encoded with the specified encoding" do
     dir = File.join(DirSpecs.mock_dir, 'special')
     entries = Dir.entries(dir, encoding: "euc-jp").sort
-    entries.first.encoding.should equal(Encoding::EUC_JP)
+    entries.first.encoding.should.equal?(Encoding::EUC_JP)
   end
 
   it "returns entries transcoded to the default internal encoding" do
     Encoding.default_internal = Encoding::EUC_KR
     entries = Dir.entries(File.join(DirSpecs.mock_dir, 'special')).sort
-    entries.first.encoding.should equal(Encoding::EUC_KR)
+    entries.first.encoding.should.equal?(Encoding::EUC_KR)
   end
 
-  it "raises a SystemCallError if called with a nonexistent diretory" do
-    lambda { Dir.entries DirSpecs.nonexistent }.should raise_error(SystemCallError)
+  it "raises a SystemCallError if called with a nonexistent directory" do
+    -> { Dir.entries DirSpecs.nonexistent }.should.raise(SystemCallError)
   end
 end