1 files changed, 13 insertions, 24 deletions
diff --git a/spec/ruby/core/env/shift_spec.rb b/spec/ruby/core/env/shift_spec.rb
index b6c139dc29..1b92e5d1e4 100644
--- a/spec/ruby/core/env/shift_spec.rb
+++ b/spec/ruby/core/env/shift_spec.rb
@@ -2,36 +2,13 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/common'
 
 describe "ENV.shift" do
-  it "returns a pair and deletes it" do
-    ENV.should_not.empty?
-    orig = ENV.to_hash
-    begin
-      pair = ENV.shift
-      ENV.has_key?(pair.first).should == false
-    ensure
-      ENV.replace orig
-    end
-    ENV.has_key?(pair.first).should == true
-  end
-
-  it "returns nil if ENV.empty?" do
-    orig = ENV.to_hash
-    begin
-      ENV.clear
-      ENV.shift.should == nil
-    ensure
-      ENV.replace orig
-    end
-  end
-end
-
-describe "ENV.shift" do
   before :each do
     @orig = ENV.to_hash
     @external = Encoding.default_external
     @internal = Encoding.default_internal
 
     Encoding.default_external = Encoding::BINARY
+    ENV.replace({"FOO"=>"BAR"})
   end
 
   after :each do
@@ -40,6 +17,18 @@ describe "ENV.shift" do
     ENV.replace @orig
   end
 
+  it "returns a pair and deletes it" do
+    ENV.should.has_key?("FOO")
+    pair = ENV.shift
+    pair.should == ["FOO", "BAR"]
+    ENV.should_not.has_key?("FOO")
+  end
+
+  it "returns nil if ENV.empty?" do
+    ENV.clear
+    ENV.shift.should == nil
+  end
+
   it "uses the locale encoding if Encoding.default_internal is nil" do
     Encoding.default_internal = nil