1 files changed, 53 insertions, 39 deletions
diff --git a/spec/ruby/language/string_spec.rb b/spec/ruby/language/string_spec.rb
index 308485d546..f287731bed 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,11 +28,21 @@ 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'
   end
 
+  it "does not interpolate invalid variable names" do
+    "#@".should == '#@'
+    "#$%".should == '#$%'
+  end
+
   it "has characters [.(=?!# end simple # interpolation" do
     "#@ip[".should == 'xxx['
     "#@ip.".should == 'xxx.'
@@ -51,26 +62,6 @@ describe "Ruby character strings" do
     "#\$".should == '#$'
   end
 
-  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
-
   it "allows using non-alnum characters as string delimiters" do
     %(hey #{@ip}).should == "hey xxx"
     %[hey #{@ip}].should == "hey xxx"
@@ -246,8 +237,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
@@ -258,30 +257,45 @@ describe "Ruby String literals" do
 end
 
 describe "Ruby String interpolation" do
-  it "creates a String having an Encoding compatible with all components" do
-    a = "\u3042"
-    b = "abc".encode("binary")
-
-    str = "#{a} x #{b}"
+  it "permits an empty expression" do
+    s = "#{}" # rubocop:disable Lint/EmptyInterpolation
+    s.should.empty?
+    s.should_not.frozen?
+  end
 
-    str.should == "\xe3\x81\x82\x20\x78\x20\x61\x62\x63".force_encoding("utf-8")
-    str.encoding.should == Encoding::UTF_8
+  it "returns a string with the source encoding by default" do
+    "a#{"b"}c".encoding.should == Encoding::BINARY
+    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 "creates a String having the Encoding of the components when all are the same Encoding" do
-    a = "abc".force_encoding("euc-jp")
-    b = "def".force_encoding("euc-jp")
-    str = '"#{a} x #{b}"'.force_encoding("euc-jp")
+  it "returns a string with the source encoding, even if the components have another encoding" do
+    a = "abc".dup.force_encoding("euc-jp")
+    "#{a}".encoding.should == Encoding::BINARY
 
-    result = eval(str)
-    result.should == "\x61\x62\x63\x20\x78\x20\x64\x65\x66".force_encoding("euc-jp")
-    result.encoding.should == Encoding::EUC_JP
+    b = "abc".encode("utf-8")
+    "#{b}".encoding.should == Encoding::BINARY
   end
 
   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)
+  end
+
+  it "creates a non-frozen String" do
+    code = <<~'RUBY'
+      "a#{6*7}c"
+    RUBY
+    eval(code).should_not.frozen?
+  end
 
-    lambda { "#{a} #{b}" }.should raise_error(Encoding::CompatibilityError)
+  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