1 files changed, 13 insertions, 7 deletions
diff --git a/activesupport/test/concern_test.rb b/activesupport/test/concern_test.rb
index a74ee880b2..253c1adc23 100644
--- a/activesupport/test/concern_test.rb
+++ b/activesupport/test/concern_test.rb
@@ -5,7 +5,7 @@ class ConcernTest < ActiveSupport::TestCase
   module Baz
     extend ActiveSupport::Concern
 
-    module ClassMethods
+    class_methods do
       def baz
         "baz"
       end
@@ -33,6 +33,12 @@ class ConcernTest < ActiveSupport::TestCase
 
     include Baz
 
+    module ClassMethods
+      def baz
+        "bar's baz + " + super
+      end
+    end
+
     def bar
       "bar"
     end
@@ -53,32 +59,32 @@ class ConcernTest < ActiveSupport::TestCase
   end
 
   def test_module_is_included_normally
-    @klass.send(:include, Baz)
+    @klass.include(Baz)
     assert_equal "baz", @klass.new.baz
     assert @klass.included_modules.include?(ConcernTest::Baz)
   end
 
   def test_class_methods_are_extended
-    @klass.send(:include, Baz)
+    @klass.include(Baz)
     assert_equal "baz", @klass.baz
     assert_equal ConcernTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
   end
 
   def test_included_block_is_ran
-    @klass.send(:include, Baz)
+    @klass.include(Baz)
     assert_equal true, @klass.included_ran
   end
 
   def test_modules_dependencies_are_met
-    @klass.send(:include, Bar)
+    @klass.include(Bar)
     assert_equal "bar", @klass.new.bar
     assert_equal "bar+baz", @klass.new.baz
-    assert_equal "baz", @klass.baz
+    assert_equal "bar's baz + baz", @klass.baz
     assert @klass.included_modules.include?(ConcernTest::Bar)
   end
 
   def test_dependencies_with_multiple_modules
-    @klass.send(:include, Foo)
+    @klass.include(Foo)
     assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz], @klass.included_modules[0..2]
   end