Make config.plugins affect $LOAD_PATH and remove duplication from $LOAD_PATH [James Adam]

Closes #6581
Closes #6842



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

1 files changed, 28 insertions, 2 deletions

diff --git a/railties/test/plugin_test.rb b/railties/test/plugin_test.rb
index 5ab1e15414..20c1e1a872 100644
--- a/railties/test/plugin_test.rb
+++ b/railties/test/plugin_test.rb
@@ -43,7 +43,7 @@ class PluginTest < Test::Unit::TestCase
 
   def test_load_plugin
     stubby = "#{File.dirname(__FILE__)}/fixtures/plugins/default/stubby"
-    expected = Set.new(['stubby'])
+    expected = ['stubby']
 
     assert @init.send(:load_plugin, stubby)
     assert_equal expected, @init.loaded_plugins
@@ -66,10 +66,36 @@ class PluginTest < Test::Unit::TestCase
   def test_load_plugins_from_two_sources
     assert_loaded_plugins %w(a stubby acts_as_chunky_bacon), ['default', 'alternate']
   end
+  
+  def test_load_all_plugins_when_config_plugins_is_nil
+    @init.configuration.plugins = nil
+    assert_loaded_plugins %w(a stubby acts_as_chunky_bacon), ['default', 'alternate']
+  end
 
+  def test_load_no_plugins_when_config_plugins_is_empty_array
+    @init.configuration.plugins = []
+    assert_loaded_plugins [], ['default', 'alternate']    
+  end
+  
+  def test_load_only_selected_plugins
+    plugins = %w(stubby a)
+    @init.configuration.plugins = plugins
+    assert_loaded_plugins plugins, ['default', 'alternate']
+  end
+  
+  def test_load_plugins_in_order
+    plugins = %w(stubby acts_as_chunky_bacon a)
+    @init.configuration.plugins = plugins
+    assert_plugin_load_order plugins, ['default', 'alternate']
+  end
+  
   protected
     def assert_loaded_plugins(plugins, path)
-      assert_equal Set.new(plugins), load_plugins(path)
+      assert_equal plugins.sort, load_plugins(path).sort
+    end
+    
+    def assert_plugin_load_order(plugins, path)
+      assert_equal plugins, load_plugins(path)
     end
 
     def load_plugins(*paths)