1 files changed, 22 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index 5b99fae411..3c49c4d14f 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -56,8 +56,14 @@ Developer = Struct.new(:client) do
   delegate :name, :to => :client, :prefix => nil
 end
 
+Event = Struct.new(:case) do
+  delegate :foo, :to => :case
+end
+
 Tester = Struct.new(:client) do
   delegate :name, :to => :client, :prefix => false
+
+  def foo; 1; end
 end
 
 Product = Struct.new(:name) do
@@ -72,7 +78,7 @@ Product = Struct.new(:name) do
 
   def type
     @type ||= begin
-      nil.type_name
+      :thing_without_same_method_name_as_delegated.name
     end
   end
 end
@@ -245,6 +251,16 @@ class ModuleTest < ActiveSupport::TestCase
     end
   end
 
+  def test_delegation_line_number
+    _, line = Someone.instance_method(:foo).source_location
+    assert_equal Someone::FAILED_DELEGATE_LINE, line
+  end
+
+  def test_delegate_line_with_nil
+    _, line = Someone.instance_method(:bar).source_location
+    assert_equal Someone::FAILED_DELEGATE_LINE_2, line
+  end
+
   def test_delegation_exception_backtrace
     someone = Someone.new("foo", "bar")
     someone.foo
@@ -485,4 +501,9 @@ class MethodAliasingTest < ActiveSupport::TestCase
     assert_equal 'duck_with_orange', @instance.duck
     assert FooClassWithBarMethod.public_method_defined?(:duck)
   end
+
+  def test_delegate_with_case
+    event = Event.new(Tester.new)
+    assert_equal 1, event.foo
+  end
 end