Merge branch 'master' of git@github.com:rails/rails

2 files changed, 12 insertions, 2 deletions

diff --git a/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb b/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb
new file mode 100644
index 0000000000..d67a127ca7
--- /dev/null
+++ b/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb
@@ -0,0 +1,10 @@
+class EngineMetal
+  def self.call(env)
+    if env["PATH_INFO"] =~ /^\/metal/
+      [200, {"Content-Type" => "text/html"}, ["Engine metal"]]
+    else
+      [404, {"Content-Type" => "text/html"}, ["Not Found"]]
+    end
+  end
+end
+
diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb
index e802b1ace7..b270748dd6 100644
--- a/railties/test/plugin_loader_test.rb
+++ b/railties/test/plugin_loader_test.rb
@@ -120,7 +120,7 @@ class TestPluginLoader < Test::Unit::TestCase
 
     @loader.add_plugin_load_paths
 
-    %w( models controllers helpers ).each do |app_part|
+    %w( models controllers metal helpers ).each do |app_part|
       assert ActiveSupport::Dependencies.load_paths.include?(
         File.join(plugin_fixture_path('engines/engine'), 'app', app_part)
       ), "Couldn't find #{app_part} in load path"
@@ -161,4 +161,4 @@ class TestPluginLoader < Test::Unit::TestCase
       $LOAD_PATH.clear
       ORIGINAL_LOAD_PATH.each { |path| $LOAD_PATH << path }
     end
-end
\ No newline at end of file
+end