1 files changed, 21 insertions, 2 deletions
diff --git a/spec/ruby/core/env/rassoc_spec.rb b/spec/ruby/core/env/rassoc_spec.rb
index 3a86e7e158..e4ac5ce5e2 100644
--- a/spec/ruby/core/env/rassoc_spec.rb
+++ b/spec/ruby/core/env/rassoc_spec.rb
@@ -1,8 +1,14 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "ENV.rassoc" do
+  before :each do
+    @foo = ENV["foo"]
+    @baz = ENV["baz"]
+  end
+
   after :each do
-    ENV.delete("foo")
+    ENV["foo"] = @foo
+    ENV["baz"] = @baz
   end
 
   it "returns an array of the key and value of the environment variable with the given value" do
@@ -10,6 +16,15 @@ describe "ENV.rassoc" do
     ENV.rassoc("bar").should == ["foo", "bar"]
   end
 
+  it "returns a single array even if there are multiple such environment variables" do
+    ENV["foo"] = "bar"
+    ENV["baz"] = "bar"
+    [
+        ["foo", "bar"],
+        ["baz", "bar"],
+    ].should.include?(ENV.rassoc("bar"))
+  end
+
   it "returns nil if no environment variable with the given value exists" do
     ENV.rassoc("bar").should == nil
   end
@@ -20,4 +35,8 @@ describe "ENV.rassoc" do
     v.should_receive(:to_str).and_return("bar")
     ENV.rassoc(v).should == ["foo", "bar"]
   end
+
+  it "returns nil if the argument is not a String and does not respond to #to_str" do
+    ENV.rassoc(Object.new).should == nil
+  end
 end