Update to ruby/spec@7de852d

2 files changed, 34 insertions, 38 deletions

diff --git a/spec/ruby/core/kernel/chomp_spec.rb b/spec/ruby/core/kernel/chomp_spec.rb
index e6dcc07d42..d30e77c35a 100644
--- a/spec/ruby/core/kernel/chomp_spec.rb
+++ b/spec/ruby/core/kernel/chomp_spec.rb
@@ -40,28 +40,26 @@ describe "Kernel#chomp" do
   it_behaves_like :kernel_chomp_private, :chomp
 end
 
-with_feature :encoding do
-  describe :kernel_chomp_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 carriage return, newline from a multi-byte $_" do
-      script = fixture __FILE__, "#{@method}.rb"
-      KernelSpecs.run_with_dash_n(script).should == "あれ"
-    end
+describe :kernel_chomp_encoded, shared: true do
+  before :each do
+    @external = Encoding.default_external
+    Encoding.default_external = Encoding::UTF_8
   end
 
-  describe "Kernel.chomp" do
-    it_behaves_like :kernel_chomp_encoded, "chomp"
+  after :each do
+    Encoding.default_external = @external
   end
 
-  describe "Kernel#chomp" do
-    it_behaves_like :kernel_chomp_encoded, "chomp_f"
+  it "removes the final carriage return, newline from a multi-byte $_" do
+    script = fixture __FILE__, "#{@method}.rb"
+    KernelSpecs.run_with_dash_n(script).should == "あれ"
   end
 end
+
+describe "Kernel.chomp" do
+  it_behaves_like :kernel_chomp_encoded, "chomp"
+end
+
+describe "Kernel#chomp" do
+  it_behaves_like :kernel_chomp_encoded, "chomp_f"
+end
diff --git a/spec/ruby/core/kernel/chop_spec.rb b/spec/ruby/core/kernel/chop_spec.rb
index e9338d8990..9b91c011bc 100644
--- a/spec/ruby/core/kernel/chop_spec.rb
+++ b/spec/ruby/core/kernel/chop_spec.rb
@@ -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