1 files changed, 18 insertions, 6 deletions
diff --git a/spec/ruby/core/env/element_reference_spec.rb b/spec/ruby/core/env/element_reference_spec.rb
index 0a10cd27b8..e3ac979418 100644
--- a/spec/ruby/core/env/element_reference_spec.rb
+++ b/spec/ruby/core/env/element_reference_spec.rb
@@ -1,5 +1,6 @@
-# -*- encoding: ascii-8bit -*-
+# encoding: binary
 require_relative '../../spec_helper'
+require_relative 'fixtures/common'
 
 describe "ENV.[]" do
   before :each do
@@ -16,7 +17,18 @@ describe "ENV.[]" do
 
   it "returns only frozen values" do
     ENV[@variable] = "a non-frozen string"
-    ENV[@variable].frozen?.should == true
+    ENV[@variable].should.frozen?
+  end
+
+  it "coerces a non-string name with #to_str" do
+    ENV[@variable] = "bar"
+    k = mock('key')
+    k.should_receive(:to_str).and_return(@variable)
+    ENV[k].should == "bar"
+  end
+
+  it "raises TypeError if the argument is not a String and does not respond to #to_str" do
+    -> { ENV[Object.new] }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   platform_is :windows do
@@ -34,7 +46,7 @@ describe "ENV.[]" do
     @external = Encoding.default_external
     @internal = Encoding.default_internal
 
-    Encoding.default_external = Encoding::ASCII_8BIT
+    Encoding.default_external = Encoding::BINARY
   end
 
   after :each do
@@ -47,8 +59,8 @@ describe "ENV.[]" do
   it "uses the locale encoding if Encoding.default_internal is nil" do
     Encoding.default_internal = nil
 
-    locale = Encoding.find('locale')
-    locale = Encoding::ASCII_8BIT if locale == Encoding::US_ASCII
+    locale = ENVSpecs.encoding
+    locale = Encoding::BINARY if locale == Encoding::US_ASCII
     ENV[@variable] = "\xC3\xB8"
     ENV[@variable].encoding.should == locale
   end
@@ -59,6 +71,6 @@ describe "ENV.[]" do
     ENV[@variable] = ""
     Encoding.default_internal = Encoding::IBM437
 
-    ENV[@variable].encoding.should equal(Encoding::IBM437)
+    ENV[@variable].encoding.should.equal?(Encoding::IBM437)
   end
 end