1 files changed, 40 insertions, 30 deletions
diff --git a/spec/ruby/core/env/element_reference_spec.rb b/spec/ruby/core/env/element_reference_spec.rb
index 2e6402dd28..66a9bc9690 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 -*-
-require File.expand_path('../../../spec_helper', __FILE__)
+# 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_error(TypeError, "no implicit conversion of Object into String")
   end
 
   platform_is :windows do
@@ -27,40 +39,38 @@ describe "ENV.[]" do
   end
 end
 
-with_feature :encoding do
-  describe "ENV.[]" do
-    before :each do
-      @variable = "env_element_reference_encoding_specs"
+describe "ENV.[]" do
+  before :each do
+    @variable = "env_element_reference_encoding_specs"
 
-      @external = Encoding.default_external
-      @internal = Encoding.default_internal
+    @external = Encoding.default_external
+    @internal = Encoding.default_internal
 
-      Encoding.default_external = Encoding::ASCII_8BIT
-    end
+    Encoding.default_external = Encoding::BINARY
+  end
 
-    after :each do
-      Encoding.default_external = @external
-      Encoding.default_internal = @internal
+  after :each do
+    Encoding.default_external = @external
+    Encoding.default_internal = @internal
 
-      ENV.delete @variable
-    end
+    ENV.delete @variable
+  end
 
-    it "uses the locale encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
+  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
-      ENV[@variable] = "\xC3\xB8"
-      ENV[@variable].encoding.should == locale
-    end
+    locale = ENVSpecs.encoding
+    locale = Encoding::BINARY if locale == Encoding::US_ASCII
+    ENV[@variable] = "\xC3\xB8"
+    ENV[@variable].encoding.should == locale
+  end
 
-    it "transcodes from the locale encoding to Encoding.default_internal if set" do
-      # We cannot reliably know the locale encoding, so we merely check that
-      # the result string has the expected encoding.
-      ENV[@variable] = ""
-      Encoding.default_internal = Encoding::IBM437
+  it "transcodes from the locale encoding to Encoding.default_internal if set" do
+    # We cannot reliably know the locale encoding, so we merely check that
+    # the result string has the expected encoding.
+    ENV[@variable] = ""
+    Encoding.default_internal = Encoding::IBM437
 
-      ENV[@variable].encoding.should equal(Encoding::IBM437)
-    end
+    ENV[@variable].encoding.should equal(Encoding::IBM437)
   end
 end