Ticket #6851: load_plugins_in_specified_order.patch

test/plugin_test.rb

@@ -43 +43 @@
-
-  def test_load_plugin
-    stubby = "#{File.dirname(__FILE__)}/fixtures/plugins/default/stubby"
-Set.new(['stubby'])
+['stubby']
-
-    assert @init.send(:load_plugin, stubby)
-    assert_equal expected, @init.loaded_plugins
@@ -66 +66 @@
-  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)
-Set.new(plugins), load_plugins(path)
+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)
-      @init.configuration.plugin_paths = paths.flatten.map { |p| "#{File.dirname(__FILE__)}/fixtures/plugins/#{p}" }

lib/initializer.rb

@@ -48 +48 @@
-    # instance.
-    def initialize(configuration)
-      @configuration = configuration
-Set.new
+[]
-    end
-
-    # Sequentially step through all of the available initialization routines,
@@ -176 +176 @@
-    # * evaluate <tt>init.rb</tt> if present
-    #
-    # After all plugins are loaded, duplicates are removed from the load path.
-
+
+
+
-    def load_plugins
-
+
+
+
+
+
+
+
+
+
+
+
-      $LOAD_PATH.uniq!
-    end
-
@@ -345 +357 @@
-      end
-
-      def plugin_enabled?(path)
-empty
+nil
-      end
-
-      # Load the plugin at <tt>path</tt> unless already loaded.
@@ -470 +482 @@
-    # any method of +nil+. Set to +false+ for the standard Ruby behavior.
-    attr_accessor :whiny_nils
-
-
+
+
+
-    attr_accessor :plugins
-
-    # The path to the root of the plugins directory. By default, it is in
@@ -642 +656 @@
-      end
-
-      def default_plugins
-[]
+nil
-      end
-
-      def default_plugin_paths