Remove LoadingModule

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3526 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

7 files changed, 0 insertions, 138 deletions

diff --git a/activesupport/test/loading_module/admin/access_controller.rb b/activesupport/test/loading_module/admin/access_controller.rb
deleted file mode 100644
index ddcbda8132..0000000000
--- a/activesupport/test/loading_module/admin/access_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Admin::AccessController
-end
diff --git a/activesupport/test/loading_module/admin/content_controller.rb b/activesupport/test/loading_module/admin/content_controller.rb
deleted file mode 100644
index 454dbac690..0000000000
--- a/activesupport/test/loading_module/admin/content_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Admin::ContentController
-  def identifier() :inner end
-end
diff --git a/activesupport/test/loading_module/admin/user_controller.rb b/activesupport/test/loading_module/admin/user_controller.rb
deleted file mode 100644
index f265f1597a..0000000000
--- a/activesupport/test/loading_module/admin/user_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Admin::UserController
-end
diff --git a/activesupport/test/loading_module/content_controller.rb b/activesupport/test/loading_module/content_controller.rb
deleted file mode 100644
index 78317b0518..0000000000
--- a/activesupport/test/loading_module/content_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class ContentController
-  def identifier() :outer end
-end
diff --git a/activesupport/test/loading_module/resource_controller.rb b/activesupport/test/loading_module/resource_controller.rb
deleted file mode 100644
index d948f366bf..0000000000
--- a/activesupport/test/loading_module/resource_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class ResourceController
-end
diff --git a/activesupport/test/loading_module_components/list/list_controller.rb b/activesupport/test/loading_module_components/list/list_controller.rb
deleted file mode 100644
index 415db868b2..0000000000
--- a/activesupport/test/loading_module_components/list/list_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class List::ListController
-end
\ No newline at end of file
diff --git a/activesupport/test/loading_module_tests.rb b/activesupport/test/loading_module_tests.rb
deleted file mode 100644
index 22fc00db7e..0000000000
--- a/activesupport/test/loading_module_tests.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/core_ext.rb'
-require File.dirname(__FILE__) + '/../lib/active_support/dependencies.rb'
-
-STAGING_DIRECTORY = File.join(File.dirname(__FILE__), 'loading_module')
-COMPONENTS_DIRECTORY = File.join(File.dirname(__FILE__), 'loading_module_components')
-
-class LoadingModuleTests < Test::Unit::TestCase
-  def setup
-    @loading_module = Dependencies::LoadingModule.root(STAGING_DIRECTORY)
-    Object.send(:remove_const, :Controllers) if Object.const_defined?(:Controllers)
-    Object.const_set(:Controllers, @loading_module)
-  end
-  def teardown
-    Object.send :remove_const, :Controllers
-    @loading_module.clear!
-    Dependencies.clear
-  end
-  
-  def test_setup
-    assert_kind_of Dependencies::LoadingModule, @loading_module
-  end
-  
-  def test_const_available
-    assert @loading_module.const_available?(:Admin)
-    assert @loading_module.const_available?(:ResourceController)
-    assert @loading_module.const_available?(:ContentController)
-    assert @loading_module.const_available?("ContentController")
-    
-    assert_equal false, @loading_module.const_available?(:AdminController)
-    assert_equal false, @loading_module.const_available?(:RandomName)
-  end
-  
-  def test_nested_const_available
-    assert @loading_module::Admin.const_available?(:AccessController)
-    assert @loading_module::Admin.const_available?(:UserController)
-    assert @loading_module::Admin.const_available?(:ContentController)
-    assert ! @loading_module::Admin.const_available?(:ResourceController)
-  end
-  
-  def test_nested_module_export
-    @loading_module::Admin
-    assert_equal @loading_module::Admin.object_id, Object::Admin.object_id
-    assert_equal @loading_module::Admin.object_id, Controllers::Admin.object_id
-  end
-  
-  def test_const_load_module
-    assert @loading_module.const_load!(:Admin)
-    assert_kind_of Module, @loading_module::Admin
-    assert_kind_of Dependencies::LoadingModule, @loading_module::Admin
-  end
-
-  def test_const_load_controller
-    assert @loading_module.const_load!(:ContentController)
-    assert_kind_of Class, @loading_module::ContentController
-  end
-  
-  def test_const_load_nested_controller
-    assert @loading_module.const_load!(:Admin)
-    assert_kind_of Dependencies::LoadingModule, @loading_module::Admin
-    assert @loading_module::Admin.const_available?(:UserController)
-    assert_kind_of Class, @loading_module::Admin::UserController
-  end
-  
-  def test_pretty_access
-    assert_kind_of Module, @loading_module::Admin
-    assert_kind_of Dependencies::LoadingModule, @loading_module::Admin
-    
-    assert_kind_of Class, @loading_module::Admin::UserController
-    assert_kind_of Class, @loading_module::Admin::AccessController
-    assert_kind_of Class, @loading_module::ResourceController
-    assert_kind_of Class, @loading_module::ContentController
-  end
-  
-  def test_missing_name
-    assert_raises(NameError) {@loading_module::PersonController}
-    assert_raises(NameError) {@loading_module::Admin::FishController}
-  end
-  
-  def test_name_clash
-    assert ! @loading_module::const_defined?(:ContentController)
-    assert_equal :outer, @loading_module::ContentController.new.identifier
-    assert ! @loading_module::Admin.const_defined?(:ContentController)
-    assert_equal :inner, @loading_module::Admin::ContentController.new.identifier
-    assert @loading_module::ContentController.object_id != @loading_module::Admin::ContentController.object_id
-  end
-
-  def test_name_clash_other_way
-    assert ! @loading_module::Admin.const_defined?(:ContentController)
-    assert_equal :inner, @loading_module::Admin::ContentController.new.identifier
-    assert ! @loading_module::const_defined?(:ContentController)
-    assert_equal :outer, @loading_module::ContentController.new.identifier
-    assert @loading_module::ContentController.object_id != @loading_module::Admin::ContentController.object_id
-  end
-
-  def test_access_to_controller_with_numbers
-    assert @loading_module.const_available?(:Area51Controller)
-    assert_not_nil @loading_module::Area51Controller
-  end
-end
-
-class LoadingModuleMultiPathTests < Test::Unit::TestCase
-  def setup
-    @loading_module = Dependencies::LoadingModule.root(STAGING_DIRECTORY, COMPONENTS_DIRECTORY)
-    Object.const_set(:Controllers, @loading_module)
-  end
-  def teardown
-    Object.send :remove_const, :Controllers
-    @loading_module.clear!
-    Dependencies.clear
-  end
-  
-  def test_access_from_first
-    assert_kind_of Module, @loading_module::Admin
-    assert_kind_of Dependencies::LoadingModule, @loading_module::Admin
-    assert_kind_of Class, @loading_module::Admin::UserController
-  end
-  def test_access_from_second
-    assert_kind_of Module, @loading_module::List
-    assert_kind_of Dependencies::LoadingModule, @loading_module::List
-    assert @loading_module::List.const_load!(:ListController)
-    assert_kind_of Class, @loading_module::List::ListController
-  end
-end