6 files changed, 68 insertions, 15 deletions

diff --git a/actionpack/test/new_base/content_type_test.rb b/actionpack/test/new_base/content_type_test.rb
index cfc03a3024..ceee508224 100644
--- a/actionpack/test/new_base/content_type_test.rb
+++ b/actionpack/test/new_base/content_type_test.rb
@@ -75,7 +75,7 @@ module ContentType
     end
 
     test "sets Content-Type as application/xml when rendering *.xml.erb" do
-      get "/content_type/implied/i_am_xml_erb"
+      get "/content_type/implied/i_am_xml_erb", "format" => "xml"
 
       assert_header "Content-Type", "application/xml; charset=utf-8"
     end
@@ -87,7 +87,7 @@ module ContentType
     end
 
     test "sets Content-Type as application/xml when rendering *.xml.builder" do
-      get "/content_type/implied/i_am_xml_builder"
+      get "/content_type/implied/i_am_xml_builder", "format" => "xml"
 
       assert_header "Content-Type", "application/xml; charset=utf-8"
     end
diff --git a/actionpack/test/new_base/metal_test.rb b/actionpack/test/new_base/metal_test.rb
new file mode 100644
index 0000000000..2b7720863a
--- /dev/null
+++ b/actionpack/test/new_base/metal_test.rb
@@ -0,0 +1,44 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+
+module MetalTest
+  class MetalMiddleware < ActionController::Middleware
+    def call(env)
+      if env["PATH_INFO"] =~ /authed/
+        app.call(env)
+      else
+        [401, headers, "Not authed!"]
+      end
+    end
+  end
+
+  class Endpoint
+    def call(env)
+      [200, {}, "Hello World"]
+    end
+  end
+
+  class TestMiddleware < ActiveSupport::TestCase
+    def setup
+      @app = Rack::Builder.new do
+        use MetalMiddleware
+        run Endpoint.new
+      end.to_app
+    end
+
+    test "it can call the next app by using @app" do
+      env = Rack::MockRequest.env_for("/authed")
+      response = @app.call(env)
+
+      assert_equal "Hello World", response[2]
+    end
+
+    test "it can return a response using the normal AC::Metal techniques" do
+      env = Rack::MockRequest.env_for("/")
+      response = @app.call(env)
+
+      assert_equal "Not authed!", response[2]
+      assert_equal 401, response[0]
+    end
+  end
+end
+
diff --git a/actionpack/test/new_base/render_layout_test.rb b/actionpack/test/new_base/render_layout_test.rb
index 279b807a5f..933eef58e7 100644
--- a/actionpack/test/new_base/render_layout_test.rb
+++ b/actionpack/test/new_base/render_layout_test.rb
@@ -83,7 +83,7 @@ module ControllerLayouts
     testing ControllerLayouts::MismatchFormatController
 
     test "if JS is selected, an HTML template is not also selected" do
-      get :index
+      get :index, "format" => "js"
       assert_response "$(\"test\").omg();"
     end
 
diff --git a/actionpack/test/new_base/render_rjs_test.rb b/actionpack/test/new_base/render_rjs_test.rb
index bd4c87b3bf..3d3e516905 100644
--- a/actionpack/test/new_base/render_rjs_test.rb
+++ b/actionpack/test/new_base/render_rjs_test.rb
@@ -21,24 +21,23 @@ module RenderRjs
     def index_locale
       old_locale, I18n.locale = I18n.locale, :da
     end
-
   end
 
   class TestBasic < SimpleRouteCase
     testing BasicController
 
     test "rendering a partial in an RJS template should pick the JS template over the HTML one" do
-      get :index
+      get :index, "format" => "js"
       assert_response("$(\"customer\").update(\"JS Partial\");")
     end
 
     test "replacing an element with a partial in an RJS template should pick the HTML template over the JS one" do
-      get :index_html
+      get :index_html, "format" => "js"
       assert_response("$(\"customer\").update(\"HTML Partial\");")
     end
 
     test "replacing an element with a partial in an RJS template with a locale should pick the localed HTML template" do
-      get :index_locale, :format => :js
+      get :index_locale, "format" => "js"
       assert_response("$(\"customer\").update(\"Danish HTML Partial\");")
     end
 
diff --git a/actionpack/test/new_base/render_template_test.rb b/actionpack/test/new_base/render_template_test.rb
index 94ea38fc7b..967cbd07b0 100644
--- a/actionpack/test/new_base/render_template_test.rb
+++ b/actionpack/test/new_base/render_template_test.rb
@@ -73,7 +73,7 @@ module RenderTemplate
     end
     
     test "rendering a builder template" do
-      get :builder_template
+      get :builder_template, "format" => "xml"
       assert_response "<html>\n  <p>Hello</p>\n</html>\n"
     end
   end
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index 9271b2dd59..b7ccd3db8d 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -35,12 +35,6 @@ class Rack::TestCase < ActionController::IntegrationTest
   setup do
     ActionController::Base.session_options[:key] = "abc"
     ActionController::Base.session_options[:secret] = ("*" * 30)
-
-    controllers = ActionController::Base.subclasses.map do |k| 
-      k.underscore.sub(/_controller$/, '')
-    end
-
-    ActionController::Routing.use_controllers!(controllers)
   end
 
   def app
@@ -91,10 +85,26 @@ end
 class ::ApplicationController < ActionController::Base
 end
 
+module ActionController
+  class << Routing
+    def possible_controllers
+      @@possible_controllers ||= []
+    end
+  end
+
+  class Base
+    def self.inherited(klass)
+      name = klass.name.underscore.sub(/_controller$/, '')
+      ActionController::Routing.possible_controllers << name unless name.blank?
+      super
+    end
+  end
+end
+
 class SimpleRouteCase < Rack::TestCase
   setup do
     ActionController::Routing::Routes.draw do |map|
       map.connect ':controller/:action/:id'
     end
   end
-end
\ No newline at end of file
+end