Revert "Update plugin loading tests to reflect changes in plugin fixtures."

This reverts commit eef9002968609a0d8d4a8006aebcd6f18f993f4a.

1 files changed, 25 insertions, 24 deletions

diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 31b3255610..0df0164ca6 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -38,27 +38,27 @@ class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::Te
     end
     config.after_initialize do
       $test_after_initialize_block2 = "congratulations"
-    end
+    end    
     assert_nil $test_after_initialize_block1
-    assert_nil $test_after_initialize_block2
+    assert_nil $test_after_initialize_block2    
 
     Rails::Initializer.run(:after_initialize, config)
   end
-
+  
   def teardown
     $test_after_initialize_block1 = nil
-    $test_after_initialize_block2 = nil
+    $test_after_initialize_block2 = nil    
   end
 
   def test_should_have_called_the_first_after_initialize_block
     assert_equal "success", $test_after_initialize_block1
   end
-
+  
   def test_should_have_called_the_second_after_initialize_block
     assert_equal "congratulations", $test_after_initialize_block2
   end
 end
-
+  
 class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::TestCase
 
   def setup
@@ -69,7 +69,7 @@ class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::
     config.after_initialize # don't pass a block, this is what we're testing!
     config.after_initialize do
       $test_after_initialize_block2 = "congratulations"
-    end
+    end    
     assert_nil $test_after_initialize_block1
 
     Rails::Initializer.run(:after_initialize, config)
@@ -77,7 +77,7 @@ class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::
 
   def teardown
     $test_after_initialize_block1 = nil
-    $test_after_initialize_block2 = nil
+    $test_after_initialize_block2 = nil    
   end
 
   def test_should_have_called_the_first_after_initialize_block
@@ -95,7 +95,7 @@ uses_mocha 'framework paths' do
     def setup
       @config = Rails::Configuration.new
       @config.frameworks.clear
-
+      
       File.stubs(:directory?).returns(true)
       @config.stubs(:framework_root_path).returns('')
     end
@@ -112,7 +112,7 @@ uses_mocha 'framework paths' do
     def test_actioncontroller_or_actionview_add_actionpack
       @config.frameworks << :action_controller
       assert_framework_path '/actionpack/lib'
-
+      
       @config.frameworks = [:action_view]
       assert_framework_path '/actionpack/lib'
     end
@@ -162,7 +162,7 @@ uses_mocha "Initializer plugin loading tests" do
     end
 
     def test_only_the_specified_plugins_are_located_in_the_order_listed
-      plugin_names = [:plugin_with_no_lib_dir]
+      plugin_names = [:plugin_with_no_lib_dir, :acts_as_chunky_bacon]
       only_load_the_following_plugins! plugin_names
       load_plugins!
       assert_plugins plugin_names, @initializer.loaded_plugins
@@ -171,27 +171,27 @@ uses_mocha "Initializer plugin loading tests" do
     def test_all_plugins_are_loaded_when_registered_plugin_list_is_untouched
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
       load_plugins!
-      assert_plugins [:plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
+      assert_plugins [:a, :acts_as_chunky_bacon, :plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
     end
 
     def test_all_plugins_loaded_when_all_is_used
-      plugin_names = [:stubby, :all]
+      plugin_names = [:stubby, :acts_as_chunky_bacon, :all]
       only_load_the_following_plugins! plugin_names
       load_plugins!
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins [:stubby, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
+      assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
     end
 
     def test_all_plugins_loaded_after_all
-      plugin_names = [:all, :stubby]
+      plugin_names = [:stubby, :all, :acts_as_chunky_bacon]
       only_load_the_following_plugins! plugin_names
       load_plugins!
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins [:plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
+      assert_plugins [:stubby, :a, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @initializer.loaded_plugins, failure_tip
     end
 
     def test_plugin_names_may_be_strings
-      plugin_names = ['stubby', :plugin_with_no_lib_dir]
+      plugin_names = ['stubby', 'acts_as_chunky_bacon', :a, :plugin_with_no_lib_dir]
       only_load_the_following_plugins! plugin_names
       load_plugins!
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
@@ -204,21 +204,22 @@ uses_mocha "Initializer plugin loading tests" do
         load_plugins!
       end
     end
-
+    
     def test_should_ensure_all_loaded_plugins_load_paths_are_added_to_the_load_path
-      only_load_the_following_plugins! [:stubby]
+      only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
 
       @initializer.add_plugin_load_paths
-
+      
       assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
+      assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
-
+    
     private
-
+    
       def load_plugins!
         @initializer.add_plugin_load_paths
         @initializer.load_plugins
       end
   end
-
-end
+  
+end