From 2854535b02bcee3668bda02c76c3105fc24730d3 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 7 May 2009 10:29:22 -0500
Subject: Make module dependency DSL opt in

---
 activesupport/test/core_ext/module/setup_test.rb | 74 -----------------------
 activesupport/test/dependency_module_test.rb     | 77 ++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 74 deletions(-)
 delete mode 100644 activesupport/test/core_ext/module/setup_test.rb
 create mode 100644 activesupport/test/dependency_module_test.rb

(limited to 'activesupport/test')

diff --git a/activesupport/test/core_ext/module/setup_test.rb b/activesupport/test/core_ext/module/setup_test.rb
deleted file mode 100644
index 132790f2ff..0000000000
--- a/activesupport/test/core_ext/module/setup_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core/time'
-require 'active_support/core_ext/module/setup'
-
-class SetupTest < Test::Unit::TestCase
-  module Baz
-    module ClassMethods
-      def baz
-        "baz"
-      end
-
-      def setup=(value)
-        @@setup = value
-      end
-
-      def setup
-        @@setup
-      end
-    end
-
-    setup do
-      self.setup = true
-    end
-
-    def baz
-      "baz"
-    end
-  end
-
-  module Bar
-    depends_on Baz
-
-    def bar
-      "bar"
-    end
-
-    def baz
-      "bar+" + super
-    end
-  end
-
-  def setup
-    @klass = Class.new
-  end
-
-  def test_module_is_included_normally
-    @klass.use(Baz)
-    assert_equal "baz", @klass.new.baz
-    assert_equal SetupTest::Baz, @klass.included_modules[0]
-
-    @klass.use(Baz)
-    assert_equal "baz", @klass.new.baz
-    assert_equal SetupTest::Baz, @klass.included_modules[0]
-  end
-
-  def test_class_methods_are_extended
-    @klass.use(Baz)
-    assert_equal "baz", @klass.baz
-    assert_equal SetupTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
-  end
-
-  def test_setup_block_is_ran
-    @klass.use(Baz)
-    assert_equal true, @klass.setup
-  end
-
-  def test_modules_dependencies_are_met
-    @klass.use(Bar)
-    assert_equal "bar", @klass.new.bar
-    assert_equal "bar+baz", @klass.new.baz
-    assert_equal "baz", @klass.baz
-    assert_equal [SetupTest::Bar, SetupTest::Baz], @klass.included_modules[0..1]
-  end
-end
diff --git a/activesupport/test/dependency_module_test.rb b/activesupport/test/dependency_module_test.rb
new file mode 100644
index 0000000000..d611b4056c
--- /dev/null
+++ b/activesupport/test/dependency_module_test.rb
@@ -0,0 +1,77 @@
+require 'abstract_unit'
+require 'active_support/dependency_module'
+
+class DependencyModuleTest < Test::Unit::TestCase
+  module Baz
+    extend ActiveSupport::DependencyModule
+
+    module ClassMethods
+      def baz
+        "baz"
+      end
+
+      def setup=(value)
+        @@setup = value
+      end
+
+      def setup
+        @@setup
+      end
+    end
+
+    setup do
+      self.setup = true
+    end
+
+    def baz
+      "baz"
+    end
+  end
+
+  module Bar
+    extend ActiveSupport::DependencyModule
+
+    depends_on Baz
+
+    def bar
+      "bar"
+    end
+
+    def baz
+      "bar+" + super
+    end
+  end
+
+  def setup
+    @klass = Class.new
+  end
+
+  def test_module_is_included_normally
+    @klass.send(:include, Baz)
+    assert_equal "baz", @klass.new.baz
+    assert_equal DependencyModuleTest::Baz, @klass.included_modules[0]
+
+    @klass.send(:include, Baz)
+    assert_equal "baz", @klass.new.baz
+    assert_equal DependencyModuleTest::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]
+  end
+
+  def test_setup_block_is_ran
+    @klass.send(:include, Baz)
+    assert_equal true, @klass.setup
+  end
+
+  def test_modules_dependencies_are_met
+    @klass.send(:include, Bar)
+    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]
+  end
+end
-- 
cgit v1.2.3