Update to ruby/spec@8cafaa5

4 files changed, 46 insertions, 4 deletions

diff --git a/spec/ruby/language/constants_spec.rb b/spec/ruby/language/constants_spec.rb
index 4d46cf2f84..6d3b1a5dd7 100644
--- a/spec/ruby/language/constants_spec.rb
+++ b/spec/ruby/language/constants_spec.rb
@@ -551,11 +551,24 @@ describe "Module#private_constant marked constants" do
     end
 
     it "can be accessed from classes that include the module" do
-      ConstantVisibility::PrivConstModuleChild.new.private_constant_from_include.should be_true
+      ConstantVisibility::ClassIncludingPrivConstModule.new.private_constant_from_include.should be_true
+    end
+
+    it "can be accessed from modules that include the module" do
+      ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_from_include.should be_true
+    end
+
+    it "raises a NameError when accessed directly from modules that include the module" do
+      -> do
+        ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_self_from_include
+      end.should raise_error(NameError)
+      -> do
+        ConstantVisibility::ModuleIncludingPrivConstModule.private_constant_named_from_include
+      end.should raise_error(NameError)
     end
 
     it "is defined? from classes that include the module" do
-      ConstantVisibility::PrivConstModuleChild.new.defined_from_include.should == "constant"
+      ConstantVisibility::ClassIncludingPrivConstModule.new.defined_from_include.should == "constant"
     end
   end
 
@@ -673,7 +686,7 @@ describe "Module#private_constant marked constants" do
       }
 
       -> do
-        ConstantVisibility::PrivConstModuleChild::PRIVATE_CONSTANT_MODULE
+        ConstantVisibility::ClassIncludingPrivConstModule::PRIVATE_CONSTANT_MODULE
       end.should raise_error(NameError) {|e|
         e.receiver.should == ConstantVisibility::PrivConstModule
         e.name.should == :PRIVATE_CONSTANT_MODULE
diff --git a/spec/ruby/language/fixtures/constant_visibility.rb b/spec/ruby/language/fixtures/constant_visibility.rb
index 022554430e..af38b2d8f2 100644
--- a/spec/ruby/language/fixtures/constant_visibility.rb
+++ b/spec/ruby/language/fixtures/constant_visibility.rb
@@ -65,7 +65,7 @@ module ConstantVisibility
     end
   end
 
-  class PrivConstModuleChild
+  class ClassIncludingPrivConstModule
     include PrivConstModule
 
     def private_constant_from_include
@@ -77,6 +77,22 @@ module ConstantVisibility
     end
   end
 
+  module ModuleIncludingPrivConstModule
+    include PrivConstModule
+
+    def self.private_constant_from_include
+      PRIVATE_CONSTANT_MODULE
+    end
+
+    def self.private_constant_self_from_include
+      self::PRIVATE_CONSTANT_MODULE
+    end
+
+    def self.private_constant_named_from_include
+      PrivConstModule::PRIVATE_CONSTANT_MODULE
+    end
+  end
+
   class PrivConstClassChild < PrivConstClass
     def private_constant_from_subclass
       PRIVATE_CONSTANT_CLASS
diff --git a/spec/ruby/language/fixtures/squiggly_heredoc.rb b/spec/ruby/language/fixtures/squiggly_heredoc.rb
index d223966b93..984a629e5b 100644
--- a/spec/ruby/language/fixtures/squiggly_heredoc.rb
+++ b/spec/ruby/language/fixtures/squiggly_heredoc.rb
@@ -29,6 +29,14 @@ module SquigglyHeredocSpecs
     HERE
   end
 
+  def self.backslash
+    <<~HERE
+      a
+      b\
+      c
+    HERE
+  end
+
   def self.least_indented_on_the_first_line
     <<~HERE
       a
diff --git a/spec/ruby/language/heredoc_spec.rb b/spec/ruby/language/heredoc_spec.rb
index 95df8457e4..61a27ad8e0 100644
--- a/spec/ruby/language/heredoc_spec.rb
+++ b/spec/ruby/language/heredoc_spec.rb
@@ -100,6 +100,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"