1 files changed, 33 insertions, 47 deletions

diff --git a/spec/ruby/language/string_spec.rb b/spec/ruby/language/string_spec.rb
index ce4941569e..163063032f 100644
--- a/spec/ruby/language/string_spec.rb
+++ b/spec/ruby/language/string_spec.rb
@@ -1,6 +1,7 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require_relative '../spec_helper'
+require_relative 'fixtures/class_with_class_variable'
 
 # TODO: rewrite these horrid specs. it "are..." seriously?!
 
@@ -27,6 +28,11 @@ describe "Ruby character strings" do
     "#$ip".should == 'xxx'
   end
 
+  it "interpolate class variables just with the # character" do
+    object = StringSpecs::ClassWithClassVariable.new
+    object.foo.should == 'xxx'
+  end
+
   it "allows underscore as part of a variable name in a simple interpolation" do
     @my_ip = 'xxx'
     "#@my_ip".should == 'xxx'
@@ -56,28 +62,6 @@ describe "Ruby character strings" do
     "#\$".should == '#$'
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints the result of interpolation when an interpolated value is tainted" do
-      "#{"".taint}".tainted?.should be_true
-
-      @ip.taint
-      "#@ip".tainted?.should be_true
-
-      $ip.taint
-      "#$ip".tainted?.should be_true
-    end
-
-    it "untrusts the result of interpolation when an interpolated value is untrusted" do
-      "#{"".untrust}".untrusted?.should be_true
-
-      @ip.untrust
-      "#@ip".untrusted?.should be_true
-
-      $ip.untrust
-      "#$ip".untrusted?.should be_true
-    end
-  end
-
   it "allows using non-alnum characters as string delimiters" do
     %(hey #{@ip}).should == "hey xxx"
     %[hey #{@ip}].should == "hey xxx"
@@ -149,6 +133,12 @@ describe "Ruby character strings" do
     "#{obj}".should == '42'
   end
 
+  it "raise NoMethodError when #to_s is not defined for the object" do
+    obj = BasicObject.new
+
+    -> { "#{obj}" }.should.raise(NoMethodError)
+  end
+
   it "uses an internal representation when #to_s doesn't return a String" do
     obj = mock('to_s')
     obj.stub!(:to_s).and_return(42)
@@ -159,7 +149,7 @@ describe "Ruby character strings" do
     # is that if you interpolate an object that fails to return
     # a String, you will still get a String and not raise an
     # exception.
-    "#{obj}".should be_an_instance_of(String)
+    "#{obj}".should.instance_of?(String)
   end
 
   it "allows a dynamic string to parse a nested do...end block as an argument to a call without parens, interpolated" do
@@ -253,8 +243,16 @@ describe "Ruby String literals" do
       ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files.rb")).chomp.should == "true"
     end
 
-    it "produce different objects for literals with the same content in different files if the other file doesn't have the comment" do
-      ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "true"
+    guard -> { !(eval("'test'").frozen? && "test".equal?("test")) } do
+      it "produces different objects for literals with the same content in different files if the other file doesn't have the comment and String literals aren't frozen by default" do
+        ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "true"
+      end
+    end
+
+    guard -> { eval("'test'").frozen? && "test".equal?("test") } do
+      it "produces the same objects for literals with the same content in different files if the other file doesn't have the comment and String literals are frozen by default" do
+        ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "false"
+      end
     end
 
     it "produce different objects for literals with the same content in different files if they have different encodings" do
@@ -273,12 +271,12 @@ describe "Ruby String interpolation" do
 
   it "returns a string with the source encoding by default" do
     "a#{"b"}c".encoding.should == Encoding::BINARY
-    eval('"a#{"b"}c"'.force_encoding("us-ascii")).encoding.should == Encoding::US_ASCII
+    eval('"a#{"b"}c"'.dup.force_encoding("us-ascii")).encoding.should == Encoding::US_ASCII
     eval("# coding: US-ASCII \n 'a#{"b"}c'").encoding.should == Encoding::US_ASCII
   end
 
   it "returns a string with the source encoding, even if the components have another encoding" do
-    a = "abc".force_encoding("euc-jp")
+    a = "abc".dup.force_encoding("euc-jp")
     "#{a}".encoding.should == Encoding::BINARY
 
     b = "abc".encode("utf-8")
@@ -287,35 +285,23 @@ describe "Ruby String interpolation" do
 
   it "raises an Encoding::CompatibilityError if the Encodings are not compatible" do
     a = "\u3042"
-    b = "\xff".force_encoding "binary"
+    b = "\xff".dup.force_encoding "binary"
 
-    -> { "#{a} #{b}" }.should raise_error(Encoding::CompatibilityError)
+    -> { "#{a} #{b}" }.should.raise(Encoding::CompatibilityError)
   end
 
   it "creates a non-frozen String" do
     code = <<~'RUBY'
-    "a#{6*7}c"
+      "a#{6*7}c"
     RUBY
     eval(code).should_not.frozen?
   end
 
-  ruby_version_is "3.0" do
-    it "creates a non-frozen String when # frozen-string-literal: true is used" do
-      code = <<~'RUBY'
-      # frozen-string-literal: true
-      "a#{6*7}c"
-      RUBY
-      eval(code).should_not.frozen?
-    end
-  end
-
-  ruby_version_is ""..."3.0" do
-    it "creates a frozen String when # frozen-string-literal: true is used" do
-      code = <<~'RUBY'
+  it "creates a non-frozen String when # frozen-string-literal: true is used" do
+    code = <<~'RUBY'
       # frozen-string-literal: true
       "a#{6*7}c"
-      RUBY
-      eval(code).should.frozen?
-    end
+    RUBY
+    eval(code).should_not.frozen?
   end
 end