7 files changed, 126 insertions, 1 deletions
diff --git a/spec/ruby/core/module/ancestors_spec.rb b/spec/ruby/core/module/ancestors_spec.rb
index 5e4c196206..43ebdb864f 100644
--- a/spec/ruby/core/module/ancestors_spec.rb
+++ b/spec/ruby/core/module/ancestors_spec.rb
@@ -21,6 +21,17 @@ describe "Module#ancestors" do
     ModuleSpecs::Parent.ancestors.should == ModuleSpecs::Parent.ancestors.uniq
   end
 
+  it "returns a module that is included later into a nested module as well" do
+    m1 = Module.new
+    m2 = Module.new
+    m3 = Module.new do
+      include m2
+    end
+    m2.include m1 # should be after m3 includes m2
+
+    m3.ancestors.should == [m3, m2, m1]
+  end
+
   describe "when called on a singleton class" do
     it "includes the singleton classes of ancestors" do
       parent  = Class.new
diff --git a/spec/ruby/core/module/const_added_spec.rb b/spec/ruby/core/module/const_added_spec.rb
index f9edda3a07..4b10dd5963 100644
--- a/spec/ruby/core/module/const_added_spec.rb
+++ b/spec/ruby/core/module/const_added_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'fixtures/const_added'
 
 describe "Module#const_added" do
   ruby_version_is "3.2" do
@@ -63,6 +64,27 @@ describe "Module#const_added" do
       ScratchPad.recorded.should == [:SubModule]
     end
 
+    it "is called when a new module is defined under a named module (assigned to a constant)" do
+      ScratchPad.record []
+
+      ModuleSpecs::ConstAddedSpecs::NamedModule = Module.new do
+        def self.const_added(name)
+          ScratchPad << name
+        end
+
+        module self::A
+          def self.const_added(name)
+            ScratchPad << name
+          end
+
+          module self::B
+          end
+        end
+      end
+
+      ScratchPad.recorded.should == [:A, :B]
+    end
+
     it "is called when a new class is defined under self" do
       ScratchPad.record []
 
@@ -83,6 +105,27 @@ describe "Module#const_added" do
       ScratchPad.recorded.should == [:SubClass]
     end
 
+    it "is called when a new class is defined under a named module (assigned to a constant)" do
+      ScratchPad.record []
+
+      ModuleSpecs::ConstAddedSpecs::NamedModuleB = Module.new do
+        def self.const_added(name)
+          ScratchPad << name
+        end
+
+        class self::A
+          def self.const_added(name)
+            ScratchPad << name
+          end
+
+          class self::B
+          end
+        end
+      end
+
+      ScratchPad.recorded.should == [:A, :B]
+    end
+
     it "is called when an autoload is defined" do
       ScratchPad.record []
 
diff --git a/spec/ruby/core/module/fixtures/const_added.rb b/spec/ruby/core/module/fixtures/const_added.rb
new file mode 100644
index 0000000000..0f5baad65d
--- /dev/null
+++ b/spec/ruby/core/module/fixtures/const_added.rb
@@ -0,0 +1,4 @@
+module ModuleSpecs
+  module ConstAddedSpecs
+  end
+end
diff --git a/spec/ruby/core/module/fixtures/name.rb b/spec/ruby/core/module/fixtures/name.rb
index fb9e66c309..25c74d3944 100644
--- a/spec/ruby/core/module/fixtures/name.rb
+++ b/spec/ruby/core/module/fixtures/name.rb
@@ -7,4 +7,7 @@ module ModuleSpecs
       Cß.name
     end
   end
+
+  module NameSpecs
+  end
 end
diff --git a/spec/ruby/core/module/include_spec.rb b/spec/ruby/core/module/include_spec.rb
index 78f6b41031..862c6976e1 100644
--- a/spec/ruby/core/module/include_spec.rb
+++ b/spec/ruby/core/module/include_spec.rb
@@ -581,6 +581,29 @@ describe "Module#include" do
     c2.include(m)
     c2.new.foo.should == [:c2, :m1]
   end
+
+  it "update a module when a nested module is updated and includes a module on its own" do
+    m1 = Module.new
+    m2 = Module.new do
+      def m2; [:m2]; end
+    end
+    m3 = Module.new do
+      def m3; [:m3]; end
+    end
+    m4 = Module.new do
+      def m4; [:m4]; end
+    end
+    c = Class.new
+
+    c.include(m1)
+    m1.include(m2)
+    m2.include(m3)
+    m3.include(m4)
+
+    c.new.m2.should == [:m2]
+    c.new.m3.should == [:m3]
+    c.new.m4.should == [:m4]
+  end
 end
 
 describe "Module#include?" do
diff --git a/spec/ruby/core/module/name_spec.rb b/spec/ruby/core/module/name_spec.rb
index 0d1f4e24d5..33e8400e88 100644
--- a/spec/ruby/core/module/name_spec.rb
+++ b/spec/ruby/core/module/name_spec.rb
@@ -140,6 +140,47 @@ describe "Module#name" do
     valid_names.should include(m::N.name) # You get one of the two, but you don't know which one.
   end
 
+  ruby_version_is "3.2" do
+    it "is set in #const_added callback when a module defined in the top-level scope" do
+      ruby_exe(<<~RUBY, args: "2>&1").chomp.should == "TEST1\nTEST2"
+        class Module
+          def const_added(name)
+            puts const_get(name).name
+          end
+        end
+
+        # module with name
+        module TEST1
+        end
+
+        # anonymous module
+        TEST2 = Module.new
+      RUBY
+    end
+
+    it "is set in #const_added callback for a nested module when an outer module defined in the top-level scope" do
+      ScratchPad.record []
+
+      ModuleSpecs::NameSpecs::NamedModule = Module.new do
+        def self.const_added(name)
+          ScratchPad << const_get(name).name
+        end
+
+        module self::A
+          def self.const_added(name)
+            ScratchPad << const_get(name).name
+          end
+
+          module self::B
+          end
+        end
+      end
+
+      ScratchPad.recorded.should.one?(/#<Module.+>::A$/)
+      ScratchPad.recorded.should.one?(/#<Module.+>::A::B$/)
+    end
+  end
+
   it "returns a frozen String" do
     ModuleSpecs.name.should.frozen?
   end
diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb
index 11085c325b..8b9ea5eca8 100644
--- a/spec/ruby/core/module/refine_spec.rb
+++ b/spec/ruby/core/module/refine_spec.rb
@@ -245,7 +245,7 @@ describe "Module#refine" do
 
     ruby_version_is ""..."3.2" do
       it "looks in the included modules for builtin methods" do
-          result = ruby_exe(<<-RUBY)
+        result = ruby_exe(<<-RUBY)
           a = Module.new do
             def /(other) quo(other) end
           end