1 files changed, 20 insertions, 22 deletions
diff --git a/spec/ruby/core/kernel/chop_spec.rb b/spec/ruby/core/kernel/chop_spec.rb
index 5106fefee8..bbf3c3f724 100644
--- a/spec/ruby/core/kernel/chop_spec.rb
+++ b/spec/ruby/core/kernel/chop_spec.rb
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe :kernel_chop, shared: true do
   it "removes the final character of $_" do
@@ -14,7 +14,7 @@ end
 
 describe :kernel_chop_private, shared: true do
   it "is a private method" do
-    KernelSpecs.has_private_method(@method).should be_true
+    KernelSpecs.has_private_method(@method).should == true
   end
 end
 
@@ -28,28 +28,26 @@ describe "Kernel#chop" do
   it_behaves_like :kernel_chop, "chop"
 end
 
-with_feature :encoding do
-  describe :kernel_chop_encoded, shared: true do
-    before :each do
-      @external = Encoding.default_external
-      Encoding.default_external = Encoding::UTF_8
-    end
-
-    after :each do
-      Encoding.default_external = @external
-    end
-
-    it "removes the final multi-byte character from $_" do
-      script = fixture __FILE__, "#{@method}.rb"
-      KernelSpecs.run_with_dash_n(script).should == "あ"
-    end
+describe :kernel_chop_encoded, shared: true do
+  before :each do
+    @external = Encoding.default_external
+    Encoding.default_external = Encoding::UTF_8
   end
 
-  describe "Kernel.chop" do
-    it_behaves_like :kernel_chop_encoded, "chop"
+  after :each do
+    Encoding.default_external = @external
   end
 
-  describe "Kernel#chop" do
-    it_behaves_like :kernel_chop_encoded, "chop_f"
+  it "removes the final multi-byte character from $_" do
+    script = fixture __FILE__, "#{@method}.rb"
+    KernelSpecs.run_with_dash_n(script).should == "あ"
   end
 end
+
+describe "Kernel.chop" do
+  it_behaves_like :kernel_chop_encoded, "chop"
+end
+
+describe "Kernel#chop" do
+  it_behaves_like :kernel_chop_encoded, "chop_f"
+end