Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

1 files changed, 10 insertions, 10 deletions

diff --git a/activesupport/test/dependency_module_test.rb b/activesupport/test/concern_test.rb
index be7db0fa7b..22f7ec2064 100644
--- a/activesupport/test/dependency_module_test.rb
+++ b/activesupport/test/concern_test.rb
@@ -1,9 +1,9 @@
 require 'abstract_unit'
-require 'active_support/dependency_module'
+require 'active_support/concern'
 
-class DependencyModuleTest < Test::Unit::TestCase
+class ConcernTest < Test::Unit::TestCase
   module Baz
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def baz
@@ -29,7 +29,7 @@ class DependencyModuleTest < Test::Unit::TestCase
   end
 
   module Bar
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on Baz
 
@@ -43,7 +43,7 @@ class DependencyModuleTest < Test::Unit::TestCase
   end
 
   module Foo
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on Bar, Baz
   end
@@ -55,17 +55,17 @@ class DependencyModuleTest < Test::Unit::TestCase
   def test_module_is_included_normally
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.new.baz
-    assert_equal DependencyModuleTest::Baz, @klass.included_modules[0]
+    assert_equal ConcernTest::Baz, @klass.included_modules[0]
 
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.new.baz
-    assert_equal DependencyModuleTest::Baz, @klass.included_modules[0]
+    assert_equal ConcernTest::Baz, @klass.included_modules[0]
   end
 
   def test_class_methods_are_extended
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.baz
-    assert_equal DependencyModuleTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
+    assert_equal ConcernTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
   end
 
   def test_included_block_is_ran
@@ -78,11 +78,11 @@ class DependencyModuleTest < Test::Unit::TestCase
     assert_equal "bar", @klass.new.bar
     assert_equal "bar+baz", @klass.new.baz
     assert_equal "baz", @klass.baz
-    assert_equal [DependencyModuleTest::Bar, DependencyModuleTest::Baz], @klass.included_modules[0..1]
+    assert_equal [ConcernTest::Bar, ConcernTest::Baz], @klass.included_modules[0..1]
   end
 
   def test_depends_on_with_multiple_modules
     @klass.send(:include, Foo)
-    assert_equal [DependencyModuleTest::Foo, DependencyModuleTest::Bar, DependencyModuleTest::Baz], @klass.included_modules[0..2]
+    assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz], @klass.included_modules[0..2]
   end
 end