1 files changed, 19 insertions, 14 deletions
diff --git a/spec/ruby/language/heredoc_spec.rb b/spec/ruby/language/heredoc_spec.rb
index 95df8457e4..535f18cba8 100644
--- a/spec/ruby/language/heredoc_spec.rb
+++ b/spec/ruby/language/heredoc_spec.rb
@@ -59,20 +59,10 @@ HERE
     s.encoding.should == Encoding::US_ASCII
   end
 
-  ruby_version_is "2.7" do
-    it 'raises SyntaxError if quoted HEREDOC identifier is ending not on same line' do
-      -> {
-        eval %{<<"HERE\n"\nraises syntax error\nHERE}
-      }.should raise_error(SyntaxError)
-    end
-  end
-
-  ruby_version_is ""..."2.7" do
-    it 'prints a warning if quoted HEREDOC identifier is ending not on same line' do
-      -> {
-        eval %{<<"HERE\n"\nit warns\nHERE}
-      }.should complain(/here document identifier ends with a newline/)
-    end
+  it 'raises SyntaxError if quoted HEREDOC identifier is ending not on same line' do
+    -> {
+      eval %{<<"HERE\n"\nraises syntax error\nHERE}
+    }.should.raise(SyntaxError)
   end
 
   it "allows HEREDOC with <<~'identifier', allowing to indent identifier and content" do
@@ -100,6 +90,11 @@ HERE
     SquigglyHeredocSpecs.singlequoted.should == "singlequoted \#{\"interpolated\"}\n"
   end
 
+  it "allows HEREDOC with <<~'identifier', no interpolation, with backslash" do
+    require_relative 'fixtures/squiggly_heredoc'
+    SquigglyHeredocSpecs.backslash.should == "a\nbc\n"
+  end
+
   it "selects the least-indented line and removes its indentation from all the lines" do
     require_relative 'fixtures/squiggly_heredoc'
     SquigglyHeredocSpecs.least_indented_on_the_first_line.should == "a\n  b\n    c\n"
@@ -111,4 +106,14 @@ HERE
     SquigglyHeredocSpecs.least_indented_on_the_first_line_single.should == "a\n  b\n    c\n"
     SquigglyHeredocSpecs.least_indented_on_the_last_line_single.should == "    a\n  b\nc\n"
   end
+
+  it "reports line numbers inside HEREDOC with method call" do
+    -> {
+      <<-HERE.chomp
+        a
+        b
+        #{c}
+      HERE
+    }.should.raise(NameError) { |e| e.backtrace[0].should.start_with?("#{__FILE__}:#{__LINE__ - 2}") }
+  end
 end