Update to ruby/spec@7de852d

1 files changed, 24 insertions, 26 deletions

diff --git a/spec/ruby/core/env/shift_spec.rb b/spec/ruby/core/env/shift_spec.rb
index c5ecc3641e..8a74f4ecac 100644
--- a/spec/ruby/core/env/shift_spec.rb
+++ b/spec/ruby/core/env/shift_spec.rb
@@ -24,36 +24,34 @@ describe "ENV.shift" do
   end
 end
 
-with_feature :encoding do
-  describe "ENV.shift" do
-    before :each do
-      @orig = ENV.to_hash
-      @external = Encoding.default_external
-      @internal = Encoding.default_internal
-
-      Encoding.default_external = Encoding::ASCII_8BIT
-    end
+describe "ENV.shift" do
+  before :each do
+    @orig = ENV.to_hash
+    @external = Encoding.default_external
+    @internal = Encoding.default_internal
 
-    after :each do
-      Encoding.default_external = @external
-      Encoding.default_internal = @internal
-      ENV.replace @orig
-    end
+    Encoding.default_external = Encoding::ASCII_8BIT
+  end
 
-    it "uses the locale encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
+  after :each do
+    Encoding.default_external = @external
+    Encoding.default_internal = @internal
+    ENV.replace @orig
+  end
 
-      pair = ENV.shift
-      pair.first.encoding.should equal(Encoding.find("locale"))
-      pair.last.encoding.should equal(Encoding.find("locale"))
-    end
+  it "uses the locale encoding if Encoding.default_internal is nil" do
+    Encoding.default_internal = nil
 
-    it "transcodes from the locale encoding to Encoding.default_internal if set" do
-      Encoding.default_internal = Encoding::IBM437
+    pair = ENV.shift
+    pair.first.encoding.should equal(Encoding.find("locale"))
+    pair.last.encoding.should equal(Encoding.find("locale"))
+  end
 
-      pair = ENV.shift
-      pair.first.encoding.should equal(Encoding::IBM437)
-      pair.last.encoding.should equal(Encoding::IBM437)
-    end
+  it "transcodes from the locale encoding to Encoding.default_internal if set" do
+    Encoding.default_internal = Encoding::IBM437
+
+    pair = ENV.shift
+    pair.first.encoding.should equal(Encoding::IBM437)
+    pair.last.encoding.should equal(Encoding::IBM437)
   end
 end