File extra test folders into controller, dispatch, or template

16 files changed, 1402 insertions, 0 deletions

diff --git a/actionpack/test/controller/new_base/base_test.rb b/actionpack/test/controller/new_base/base_test.rb
new file mode 100644
index 0000000000..effde324bc
--- /dev/null
+++ b/actionpack/test/controller/new_base/base_test.rb
@@ -0,0 +1,68 @@
+require 'abstract_unit'
+
+# Tests the controller dispatching happy path
+module Dispatching
+  class SimpleController < ActionController::Base
+    def index
+      render :text => "success"
+    end
+
+    def modify_response_body
+      self.response_body = "success"
+    end
+
+    def modify_response_body_twice
+      ret = (self.response_body = "success") 
+      self.response_body = "#{ret}!"
+    end
+
+    def modify_response_headers
+    end
+  end
+
+  class EmptyController < ActionController::Base ; end
+
+  module Submodule
+    class ContainedEmptyController < ActionController::Base ; end
+  end
+
+  class BaseTest < SimpleRouteCase
+    # :api: plugin
+    test "simple dispatching" do
+      get "/dispatching/simple/index"
+
+      assert_body "success"
+      assert_status 200
+      assert_content_type "text/html; charset=utf-8"
+    end
+
+    # :api: plugin
+    test "directly modifying response body" do
+      get "/dispatching/simple/modify_response_body"
+
+      assert_body "success"
+    end
+
+    # :api: plugin
+    test "directly modifying response body twice" do
+      get "/dispatching/simple/modify_response_body_twice"
+
+      assert_body "success!"
+    end
+
+    test "controller path" do
+      assert_equal 'dispatching/empty', EmptyController.controller_path
+      assert_equal EmptyController.controller_path, EmptyController.new.controller_path
+    end
+
+    test "namespaced controller path" do
+      assert_equal 'dispatching/submodule/contained_empty', Submodule::ContainedEmptyController.controller_path
+      assert_equal Submodule::ContainedEmptyController.controller_path, Submodule::ContainedEmptyController.new.controller_path
+    end
+
+    test "controller name" do
+      assert_equal 'empty', EmptyController.controller_name
+      assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/content_negotiation_test.rb b/actionpack/test/controller/new_base/content_negotiation_test.rb
new file mode 100644
index 0000000000..c43cb677f8
--- /dev/null
+++ b/actionpack/test/controller/new_base/content_negotiation_test.rb
@@ -0,0 +1,18 @@
+require 'abstract_unit'
+
+module ContentNegotiation
+
+  # This has no layout and it works
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "content_negotiation/basic/hello.html.erb" => "Hello world <%= request.formats %>!"
+    )]
+  end
+
+  class TestContentNegotiation < SimpleRouteCase
+    test "A */* Accept header will return HTML" do
+      get "/content_negotiation/basic/hello", {}, "HTTP_ACCEPT" => "*/*"
+      assert_body "Hello world */*!"
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/content_type_test.rb b/actionpack/test/controller/new_base/content_type_test.rb
new file mode 100644
index 0000000000..898d0bb9f3
--- /dev/null
+++ b/actionpack/test/controller/new_base/content_type_test.rb
@@ -0,0 +1,111 @@
+require 'abstract_unit'
+
+module ContentType
+  class BaseController < ActionController::Base
+    def index
+      render :text => "Hello world!"
+    end
+
+    def set_on_response_obj
+      response.content_type = Mime::RSS
+      render :text => "Hello world!"
+    end
+
+    def set_on_render
+      render :text => "Hello world!", :content_type => Mime::RSS
+    end
+  end
+
+  class ImpliedController < ActionController::Base
+    # Template's mime type is used if no content_type is specified
+
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "content_type/implied/i_am_html_erb.html.erb"         => "Hello world!",
+      "content_type/implied/i_am_xml_erb.xml.erb"          => "<xml>Hello world!</xml>",
+      "content_type/implied/i_am_html_builder.html.builder" => "xml.p 'Hello'",
+      "content_type/implied/i_am_xml_builder.xml.builder"  => "xml.awesome 'Hello'"
+    )]
+
+    def i_am_html_erb()     end
+    def i_am_xml_erb()      end
+    def i_am_html_builder() end
+    def i_am_xml_builder()  end
+  end
+
+  class CharsetController < ActionController::Base
+    def set_on_response_obj
+      response.charset = "utf-16"
+      render :text => "Hello world!"
+    end
+
+    def set_as_nil_on_response_obj
+      response.charset = nil
+      render :text => "Hello world!"
+    end
+  end
+
+  class ExplicitContentTypeTest < SimpleRouteCase
+    test "default response is HTML and UTF8" do
+      get "/content_type/base"
+
+      assert_body "Hello world!"
+      assert_header "Content-Type", "text/html; charset=utf-8"
+    end
+
+    test "setting the content type of the response directly on the response object" do
+      get "/content_type/base/set_on_response_obj"
+
+      assert_body "Hello world!"
+      assert_header "Content-Type", "application/rss+xml; charset=utf-8"
+    end
+
+    test "setting the content type of the response as an option to render" do
+      get "/content_type/base/set_on_render"
+
+      assert_body "Hello world!"
+      assert_header "Content-Type", "application/rss+xml; charset=utf-8"
+    end
+  end
+
+  class ImpliedContentTypeTest < SimpleRouteCase
+    test "sets Content-Type as text/html when rendering *.html.erb" do
+      get "/content_type/implied/i_am_html_erb"
+
+      assert_header "Content-Type", "text/html; charset=utf-8"
+    end
+
+    test "sets Content-Type as application/xml when rendering *.xml.erb" do
+      get "/content_type/implied/i_am_xml_erb", "format" => "xml"
+
+      assert_header "Content-Type", "application/xml; charset=utf-8"
+    end
+
+    test "sets Content-Type as text/html when rendering *.html.builder" do
+      get "/content_type/implied/i_am_html_builder"
+
+      assert_header "Content-Type", "text/html; charset=utf-8"
+    end
+
+    test "sets Content-Type as application/xml when rendering *.xml.builder" do
+      get "/content_type/implied/i_am_xml_builder", "format" => "xml"
+
+      assert_header "Content-Type", "application/xml; charset=utf-8"
+    end
+  end
+
+  class ExplicitCharsetTest < SimpleRouteCase
+    test "setting the charset of the response directly on the response object" do
+      get "/content_type/charset/set_on_response_obj"
+
+      assert_body   "Hello world!"
+      assert_header "Content-Type", "text/html; charset=utf-16"
+    end
+
+    test "setting the charset of the response as nil directly on the response object" do
+      get "/content_type/charset/set_as_nil_on_response_obj"
+
+      assert_body   "Hello world!"
+      assert_header "Content-Type", "text/html; charset=utf-8"
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/etag_test.rb b/actionpack/test/controller/new_base/etag_test.rb
new file mode 100644
index 0000000000..d5b7942ab6
--- /dev/null
+++ b/actionpack/test/controller/new_base/etag_test.rb
@@ -0,0 +1,46 @@
+require 'abstract_unit'
+
+module Etags
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "etags/basic/base.html.erb" => "Hello from without_layout.html.erb",
+      "layouts/etags.html.erb"    => "teh <%= yield %> tagz"
+    )]
+
+    def without_layout
+      render :action => "base"
+    end
+
+    def with_layout
+      render :action => "base", :layout => "etags"
+    end
+  end
+
+  class EtagTest < SimpleRouteCase
+    describe "Rendering without any special etag options returns an etag that is an MD5 hash of its text"
+
+    test "an action without a layout" do
+      get "/etags/basic/without_layout"
+
+      body = "Hello from without_layout.html.erb"
+      assert_body body
+      assert_header "Etag", etag_for(body)
+      assert_status 200
+    end
+
+    test "an action with a layout" do
+      get "/etags/basic/with_layout"
+
+      body = "teh Hello from without_layout.html.erb tagz"
+      assert_body body
+      assert_header "Etag", etag_for(body)
+      assert_status 200      
+    end
+
+    private
+
+    def etag_for(text)
+      %("#{Digest::MD5.hexdigest(text)}")
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/metal_test.rb b/actionpack/test/controller/new_base/metal_test.rb
new file mode 100644
index 0000000000..e1d46b906e
--- /dev/null
+++ b/actionpack/test/controller/new_base/metal_test.rb
@@ -0,0 +1,43 @@
+require 'abstract_unit'
+
+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/controller/new_base/middleware_test.rb b/actionpack/test/controller/new_base/middleware_test.rb
new file mode 100644
index 0000000000..ada0215b1a
--- /dev/null
+++ b/actionpack/test/controller/new_base/middleware_test.rb
@@ -0,0 +1,77 @@
+require 'abstract_unit'
+
+module MiddlewareTest
+  class MyMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      result = @app.call(env)
+      result[1]["Middleware-Test"] = "Success"
+      result[1]["Middleware-Order"] = "First"
+      result
+    end
+  end
+
+  class ExclaimerMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      result = @app.call(env)
+      result[1]["Middleware-Order"] << "!"
+      result
+    end
+  end
+
+  class MyController < ActionController::Metal
+    use MyMiddleware
+
+    middleware.insert_before MyMiddleware, ExclaimerMiddleware
+
+    def index
+      self.response_body = "Hello World"
+    end
+  end
+
+  class InheritedController < MyController
+  end
+
+  module MiddlewareTests
+    extend ActiveSupport::Testing::Declarative
+
+    test "middleware that is 'use'd is called as part of the Rack application" do
+      result = @app.call(env_for("/"))
+      assert_equal "Hello World", result[2]
+      assert_equal "Success", result[1]["Middleware-Test"]
+    end
+
+    test "the middleware stack is exposed as 'middleware' in the controller" do
+      result = @app.call(env_for("/"))
+      assert_equal "First!", result[1]["Middleware-Order"]
+    end
+  end
+
+  class TestMiddleware < ActiveSupport::TestCase
+    include MiddlewareTests
+
+    def setup
+      @app = MyController.action(:index)
+    end
+
+    def env_for(url)
+      Rack::MockRequest.env_for(url)
+    end
+  end
+
+  class TestInheritedMiddleware < TestMiddleware
+    def setup
+      @app = InheritedController.action(:index)
+    end
+
+    test "middleware inherits" do
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_action_test.rb b/actionpack/test/controller/new_base/render_action_test.rb
new file mode 100644
index 0000000000..d5896c1ebd
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_action_test.rb
@@ -0,0 +1,320 @@
+require 'abstract_unit'
+
+module RenderAction
+  # This has no layout and it works
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_action/basic/hello_world.html.erb" => "Hello world!"
+    )]
+
+    def hello_world
+      render :action => "hello_world"
+    end
+
+    def hello_world_as_string
+      render "hello_world"
+    end
+
+    def hello_world_as_string_with_options
+      render "hello_world", :status => 404
+    end
+
+    def hello_world_as_symbol
+      render :hello_world
+    end
+
+    def hello_world_with_symbol
+      render :action => :hello_world
+    end
+
+    def hello_world_with_layout
+      render :action => "hello_world", :layout => true
+    end
+
+    def hello_world_with_layout_false
+      render :action => "hello_world", :layout => false
+    end
+
+    def hello_world_with_layout_nil
+      render :action => "hello_world", :layout => nil
+    end
+
+    def hello_world_with_custom_layout
+      render :action => "hello_world", :layout => "greetings"
+    end
+
+  end
+
+  class RenderActionTest < SimpleRouteCase
+    test "rendering an action using :action => <String>" do
+      get "/render_action/basic/hello_world"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+
+    test "rendering an action using '<action>'" do
+      get "/render_action/basic/hello_world_as_string"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+
+    test "rendering an action using '<action>' and options" do
+      get "/render_action/basic/hello_world_as_string_with_options"
+
+      assert_body "Hello world!"
+      assert_status 404
+    end
+
+    test "rendering an action using :action" do
+      get "/render_action/basic/hello_world_as_symbol"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+
+    test "rendering an action using :action => :hello_world" do
+      get "/render_action/basic/hello_world_with_symbol"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+  end
+
+  class RenderLayoutTest < SimpleRouteCase
+    describe "Both <controller_path>.html.erb and application.html.erb are missing"
+
+    test "rendering with layout => true" do
+      assert_raise(ArgumentError, /no default layout for RenderAction::BasicController in/) do
+        get "/render_action/basic/hello_world_with_layout", {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+
+    test "rendering with layout => false" do
+      get "/render_action/basic/hello_world_with_layout_false"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+
+    test "rendering with layout => :nil" do
+      get "/render_action/basic/hello_world_with_layout_nil"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+
+    test "rendering with layout => 'greetings'" do
+      assert_raise(ActionView::MissingTemplate) do
+        get "/render_action/basic/hello_world_with_custom_layout", {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+  end
+end
+
+module RenderActionWithApplicationLayout
+  # # ==== Render actions with layouts ====
+  class BasicController < ::ApplicationController
+    # Set the view path to an application view structure with layouts
+    self.view_paths = self.view_paths = [ActionView::FixtureResolver.new(
+      "render_action_with_application_layout/basic/hello_world.html.erb" => "Hello World!",
+      "render_action_with_application_layout/basic/hello.html.builder"   => "xml.p 'Omg'",
+      "layouts/application.html.erb"                                     => "OHAI <%= yield %> KTHXBAI",
+      "layouts/greetings.html.erb"                                       => "Greetings <%= yield %> Bai",
+      "layouts/builder.html.builder"                                     => "xml.html do\n  xml << yield\nend"
+    )]
+
+    def hello_world
+      render :action => "hello_world"
+    end
+
+    def hello_world_with_layout
+      render :action => "hello_world", :layout => true
+    end
+
+    def hello_world_with_layout_false
+      render :action => "hello_world", :layout => false
+    end
+
+    def hello_world_with_layout_nil
+      render :action => "hello_world", :layout => nil
+    end
+
+    def hello_world_with_custom_layout
+      render :action => "hello_world", :layout => "greetings"
+    end
+
+    def with_builder_and_layout
+      render :action => "hello", :layout => "builder"
+    end
+  end
+
+  class LayoutTest < SimpleRouteCase
+    describe "Only application.html.erb is present and <controller_path>.html.erb is missing"
+
+    test "rendering implicit application.html.erb as layout" do
+      get "/render_action_with_application_layout/basic/hello_world"
+
+      assert_body "OHAI Hello World! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering with layout => true" do
+      get "/render_action_with_application_layout/basic/hello_world_with_layout"
+
+      assert_body "OHAI Hello World! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering with layout => false" do
+      get "/render_action_with_application_layout/basic/hello_world_with_layout_false"
+
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering with layout => :nil" do
+      get "/render_action_with_application_layout/basic/hello_world_with_layout_nil"
+
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering with layout => 'greetings'" do
+      get "/render_action_with_application_layout/basic/hello_world_with_custom_layout"
+
+      assert_body "Greetings Hello World! Bai"
+      assert_status 200
+    end
+  end
+
+  class TestLayout < SimpleRouteCase
+    testing BasicController
+
+    test "builder works with layouts" do
+      get :with_builder_and_layout
+      assert_response "<html>\n<p>Omg</p>\n</html>\n"
+    end
+  end
+
+end
+
+module RenderActionWithControllerLayout
+  class BasicController < ActionController::Base
+    self.view_paths = self.view_paths = [ActionView::FixtureResolver.new(
+      "render_action_with_controller_layout/basic/hello_world.html.erb" => "Hello World!",
+      "layouts/render_action_with_controller_layout/basic.html.erb"     => "With Controller Layout! <%= yield %> KTHXBAI"
+    )]
+
+    def hello_world
+      render :action => "hello_world"
+    end
+
+    def hello_world_with_layout
+      render :action => "hello_world", :layout => true
+    end
+
+    def hello_world_with_layout_false
+      render :action => "hello_world", :layout => false
+    end
+
+    def hello_world_with_layout_nil
+      render :action => "hello_world", :layout => nil
+    end
+
+    def hello_world_with_custom_layout
+      render :action => "hello_world", :layout => "greetings"
+    end
+  end
+
+  class ControllerLayoutTest < SimpleRouteCase
+    describe "Only <controller_path>.html.erb is present and application.html.erb is missing"
+
+    test "render hello_world and implicitly use <controller_path>.html.erb as a layout." do
+      get "/render_action_with_controller_layout/basic/hello_world"
+
+      assert_body "With Controller Layout! Hello World! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering with layout => true" do
+      get "/render_action_with_controller_layout/basic/hello_world_with_layout"
+
+      assert_body "With Controller Layout! Hello World! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering with layout => false" do
+      get "/render_action_with_controller_layout/basic/hello_world_with_layout_false"
+
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering with layout => :nil" do
+      get "/render_action_with_controller_layout/basic/hello_world_with_layout_nil"
+
+      assert_body "Hello World!"
+      assert_status 200
+    end
+  end
+end
+
+module RenderActionWithBothLayouts
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new({
+      "render_action_with_both_layouts/basic/hello_world.html.erb" => "Hello World!",
+      "layouts/application.html.erb"                                => "OHAI <%= yield %> KTHXBAI",
+      "layouts/render_action_with_both_layouts/basic.html.erb"      => "With Controller Layout! <%= yield %> KTHXBAI"
+    })]
+
+    def hello_world
+      render :action => "hello_world"
+    end
+
+    def hello_world_with_layout
+      render :action => "hello_world", :layout => true
+    end
+
+    def hello_world_with_layout_false
+      render :action => "hello_world", :layout => false
+    end
+
+    def hello_world_with_layout_nil
+      render :action => "hello_world", :layout => nil
+    end
+  end
+
+  class ControllerLayoutTest < SimpleRouteCase
+    describe "Both <controller_path>.html.erb and application.html.erb are present"
+
+    test "rendering implicitly use <controller_path>.html.erb over application.html.erb as a layout" do
+      get "/render_action_with_both_layouts/basic/hello_world"
+
+      assert_body   "With Controller Layout! Hello World! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering with layout => true" do
+      get "/render_action_with_both_layouts/basic/hello_world_with_layout"
+
+      assert_body "With Controller Layout! Hello World! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering with layout => false" do
+      get "/render_action_with_both_layouts/basic/hello_world_with_layout_false"
+
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering with layout => :nil" do
+      get "/render_action_with_both_layouts/basic/hello_world_with_layout_nil"
+
+      assert_body "Hello World!"
+      assert_status 200
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_file_test.rb b/actionpack/test/controller/new_base/render_file_test.rb
new file mode 100644
index 0000000000..1c52d2b37d
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_file_test.rb
@@ -0,0 +1,110 @@
+require 'abstract_unit'
+
+module RenderFile
+  
+  class BasicController < ActionController::Base
+      self.view_paths = File.dirname(__FILE__)
+    
+    def index
+      render :file => File.join(File.dirname(__FILE__), *%w[.. .. fixtures test hello_world])
+    end
+    
+    def with_instance_variables
+      @secret = 'in the sauce'
+      render :file => File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar.erb')
+    end
+    
+    def without_file_key
+      render File.join(File.dirname(__FILE__), *%w[.. .. fixtures test hello_world])
+    end
+    
+    def without_file_key_with_instance_variable
+      @secret = 'in the sauce'
+      render File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar.erb')
+    end
+    
+    def relative_path
+      @secret = 'in the sauce'
+      render :file => '../../fixtures/test/render_file_with_ivar'
+    end
+    
+    def relative_path_with_dot
+      @secret = 'in the sauce'
+      render :file => '../../fixtures/test/dot.directory/render_file_with_ivar'
+    end
+    
+    def pathname
+      @secret = 'in the sauce'
+      render :file => Pathname.new(File.dirname(__FILE__)).join(*%w[.. .. fixtures test dot.directory render_file_with_ivar.erb])
+    end
+    
+    def with_locals
+      path = File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals.erb')
+      render :file => path, :locals => {:secret => 'in the sauce'}
+    end
+    
+    def without_file_key_with_locals
+      path = File.expand_path('../../fixtures/test/render_file_with_locals.erb')
+      render path, :locals => {:secret => 'in the sauce'}
+    end
+  end
+  
+  class TestBasic < SimpleRouteCase
+    testing RenderFile::BasicController
+    
+    def setup
+      @old_pwd = Dir.pwd
+      Dir.chdir(File.dirname(__FILE__))
+    end
+    
+    def teardown
+      Dir.chdir(@old_pwd)
+    end
+    
+    test "rendering simple template" do
+      get :index
+      assert_response "Hello world!"
+    end
+    
+    test "rendering template with ivar" do
+      get :with_instance_variables
+      assert_response "The secret is in the sauce\n"
+    end
+    
+    test "rendering path without specifying the :file key" do
+      get :without_file_key
+      assert_response "Hello world!"
+    end
+    
+    test "rendering path without specifying the :file key with ivar" do
+      get :without_file_key_with_instance_variable
+      assert_response "The secret is in the sauce\n"
+    end
+    
+    test "rendering a relative path" do
+      get :relative_path
+      assert_response "The secret is in the sauce\n"
+    end
+    
+    test "rendering a relative path with dot" do
+      get :relative_path_with_dot
+      assert_response "The secret is in the sauce\n"
+    end
+    
+    test "rendering a Pathname" do
+      get :pathname
+      assert_response "The secret is in the sauce\n"
+    end
+    
+    test "rendering file with locals" do
+      get :with_locals
+      assert_response "The secret is in the sauce\n"
+    end
+    
+    test "rendering path without specifying the :file key with locals" do
+      get :without_file_key_with_locals
+      assert_response "The secret is in the sauce\n"
+    end
+  end
+  
+end
diff --git a/actionpack/test/controller/new_base/render_implicit_action_test.rb b/actionpack/test/controller/new_base/render_implicit_action_test.rb
new file mode 100644
index 0000000000..2b78fa7d4f
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_implicit_action_test.rb
@@ -0,0 +1,28 @@
+require 'abstract_unit'
+
+module RenderImplicitAction
+  class SimpleController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_implicit_action/simple/hello_world.html.erb" => "Hello world!",
+      "render_implicit_action/simple/hyphen-ated.html.erb" => "Hello hyphen-ated!"
+    )]
+    
+    def hello_world() end
+  end
+  
+  class RenderImplicitActionTest < SimpleRouteCase
+    test "render a simple action with new explicit call to render" do
+      get "/render_implicit_action/simple/hello_world"
+
+      assert_body   "Hello world!"
+      assert_status 200
+    end
+
+    test "render an action with a missing method and has special characters" do
+      get "/render_implicit_action/simple/hyphen-ated"
+
+      assert_body   "Hello hyphen-ated!"
+      assert_status 200
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_layout_test.rb b/actionpack/test/controller/new_base/render_layout_test.rb
new file mode 100644
index 0000000000..f840a47ecf
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -0,0 +1,101 @@
+require 'abstract_unit'
+
+module ControllerLayouts
+  class ImplicitController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.html.erb" => "OMG <%= yield %> KTHXBAI",
+      "layouts/override.html.erb"    => "Override! <%= yield %>",
+      "basic.html.erb"               => "Hello world!",
+      "controller_layouts/implicit/layout_false.html.erb" => "hai(layout_false.html.erb)"
+    )]
+
+    def index
+      render :template => "basic"
+    end
+
+    def override
+      render :template => "basic", :layout => "override"
+    end
+
+    def layout_false
+      render :layout => false
+    end
+
+    def builder_override
+    end
+  end
+
+  class ImplicitNameController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/controller_layouts/implicit_name.html.erb" => "OMGIMPLICIT <%= yield %> KTHXBAI",
+      "basic.html.erb" => "Hello world!"
+    )]
+
+    def index
+      render :template => "basic"
+    end
+  end
+
+  class RenderLayoutTest < SimpleRouteCase
+    test "rendering a normal template, but using the implicit layout" do
+      get "/controller_layouts/implicit/index"
+
+      assert_body   "OMG Hello world! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering a normal template, but using an implicit NAMED layout" do
+      get "/controller_layouts/implicit_name/index"
+
+      assert_body "OMGIMPLICIT Hello world! KTHXBAI"
+      assert_status 200
+    end
+
+    test "overriding an implicit layout with render :layout option" do
+      get "/controller_layouts/implicit/override"
+      assert_body "Override! Hello world!"
+    end
+
+  end
+
+  class LayoutOptionsTest < SimpleRouteCase
+    testing ControllerLayouts::ImplicitController
+
+    test "rendering with :layout => false leaves out the implicit layout" do
+      get :layout_false
+      assert_response "hai(layout_false.html.erb)"
+    end
+  end
+
+  class MismatchFormatController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.html.erb" => "<html><%= yield %></html>",
+      "controller_layouts/mismatch_format/index.js.rjs" => "page[:test].omg",
+      "controller_layouts/mismatch_format/implicit.rjs" => "page[:test].omg"      
+    )]
+
+    def explicit
+      render :layout => "application"
+    end
+  end
+
+  class MismatchFormatTest < SimpleRouteCase
+    testing ControllerLayouts::MismatchFormatController
+
+    test "if JS is selected, an HTML template is not also selected" do
+      get :index, "format" => "js"
+      assert_response "$(\"test\").omg();"
+    end
+
+    test "if JS is implicitly selected, an HTML template is not also selected" do
+      get :implicit
+      assert_response "$(\"test\").omg();"
+    end
+
+    test "if an HTML template is explicitly provides for a JS template, an error is raised" do
+      assert_raises ActionView::MissingTemplate do
+        get :explicit, {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_partial_test.rb b/actionpack/test/controller/new_base/render_partial_test.rb
new file mode 100644
index 0000000000..7c2c20e1c7
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_partial_test.rb
@@ -0,0 +1,27 @@
+require 'abstract_unit'
+
+module RenderPartial
+  
+  class BasicController < ActionController::Base
+    
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_partial/basic/_basic.html.erb"    => "OMG!",
+      "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>"
+    )]
+    
+    def changing
+      @test_unchanged = 'hello'
+      render :action => "basic"
+    end    
+  end
+  
+  class TestPartial < SimpleRouteCase
+    testing BasicController
+    
+    test "rendering a partial in ActionView doesn't pull the ivars again from the controller" do
+      get :changing
+      assert_response("goodbyeOMG!goodbye")
+    end
+  end
+  
+end
diff --git a/actionpack/test/controller/new_base/render_rjs_test.rb b/actionpack/test/controller/new_base/render_rjs_test.rb
new file mode 100644
index 0000000000..7b76c54ab9
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_rjs_test.rb
@@ -0,0 +1,50 @@
+require 'abstract_unit'
+
+module RenderRjs
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_rjs/basic/index.js.rjs"          => "page[:customer].replace_html render(:partial => 'customer')",
+      "render_rjs/basic/index_html.js.rjs"     => "page[:customer].replace_html :partial => 'customer'",
+      "render_rjs/basic/_customer.js.erb"      => "JS Partial",
+      "render_rjs/basic/_customer.html.erb"    => "HTML Partial",
+      "render_rjs/basic/index_locale.js.rjs"   => "page[:customer].replace_html :partial => 'customer'",
+      "render_rjs/basic/_customer.da.html.erb" => "Danish HTML Partial",
+      "render_rjs/basic/_customer.da.js.erb"   => "Danish JS Partial"
+    )]
+
+    def index
+      render
+    end
+
+    def index_locale
+      old_locale, I18n.locale = I18n.locale, :da
+    end
+  end
+
+  class TestBasic < SimpleRouteCase
+    testing BasicController
+
+    def setup
+      @old_locale = I18n.locale
+    end
+
+    def teardown
+      I18n.locale = @old_locale
+    end
+
+    test "rendering a partial in an RJS template should pick the JS template over the HTML one" do
+      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, "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"
+      assert_response("$(\"customer\").update(\"Danish HTML Partial\");")
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
new file mode 100644
index 0000000000..3b24c2d75a
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -0,0 +1,170 @@
+require 'abstract_unit'
+
+module RenderTemplate
+  class WithoutLayoutController < ActionController::Base
+    
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "test/basic.html.erb"      => "Hello from basic.html.erb",
+      "shared.html.erb"          => "Elastica",
+      "locals.html.erb"          => "The secret is <%= secret %>",
+      "xml_template.xml.builder" => "xml.html do\n  xml.p 'Hello'\nend"
+    )]
+    
+    def index
+      render :template => "test/basic"
+    end
+    
+    def index_without_key
+      render "test/basic"
+    end
+
+    def in_top_directory
+      render :template => 'shared'
+    end
+
+    def in_top_directory_with_slash
+      render :template => '/shared'
+    end
+    
+    def in_top_directory_with_slash_without_key
+      render '/shared'
+    end
+    
+    def with_locals
+      render :template => "locals", :locals => { :secret => 'area51' }
+    end
+    
+    def builder_template
+      render :template => "xml_template"
+    end
+  end
+  
+  class TestWithoutLayout < SimpleRouteCase
+    testing RenderTemplate::WithoutLayoutController
+    
+    test "rendering a normal template with full path without layout" do
+      get :index
+      assert_response "Hello from basic.html.erb"
+    end
+    
+    test "rendering a normal template with full path without layout without key" do
+      get :index_without_key
+      assert_response "Hello from basic.html.erb"
+    end
+    
+    test "rendering a template not in a subdirectory" do
+      get :in_top_directory
+      assert_response "Elastica"
+    end
+    
+    test "rendering a template not in a subdirectory with a leading slash" do
+      get :in_top_directory_with_slash
+      assert_response "Elastica"
+    end
+    
+    test "rendering a template not in a subdirectory with a leading slash without key" do
+      get :in_top_directory_with_slash_without_key
+      assert_response "Elastica"
+    end
+    
+    test "rendering a template with local variables" do
+      get :with_locals
+      assert_response "The secret is area51"
+    end
+    
+    test "rendering a builder template" do
+      get :builder_template, "format" => "xml"
+      assert_response "<html>\n  <p>Hello</p>\n</html>\n"
+    end
+  end
+    
+  class WithLayoutController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "test/basic.html.erb"          => "Hello from basic.html.erb",
+      "shared.html.erb"              => "Elastica",
+      "layouts/application.html.erb" => "<%= yield %>, I'm here!",
+      "layouts/greetings.html.erb"   => "<%= yield %>, I wish thee well."
+    )]
+    
+    def index
+      render :template => "test/basic"
+    end
+    
+    def with_layout
+      render :template => "test/basic", :layout => true
+    end
+    
+    def with_layout_false
+      render :template => "test/basic", :layout => false
+    end
+    
+    def with_layout_nil
+      render :template => "test/basic", :layout => nil
+    end
+    
+    def with_custom_layout
+      render :template => "test/basic", :layout => "greetings"
+    end
+  end
+  
+  class TestWithLayout < SimpleRouteCase
+    describe "Rendering with :template using implicit or explicit layout"
+
+    test "rendering with implicit layout" do
+      get "/render_template/with_layout"
+
+      assert_body "Hello from basic.html.erb, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering with layout => :true" do
+      get "/render_template/with_layout/with_layout"
+
+      assert_body "Hello from basic.html.erb, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering with layout => :false" do
+      get "/render_template/with_layout/with_layout_false"
+
+      assert_body "Hello from basic.html.erb"
+      assert_status 200
+    end
+
+    test "rendering with layout => :nil" do
+      get "/render_template/with_layout/with_layout_nil"
+
+      assert_body "Hello from basic.html.erb"
+      assert_status 200
+    end
+
+    test "rendering layout => 'greetings'" do
+      get "/render_template/with_layout/with_custom_layout"
+
+      assert_body "Hello from basic.html.erb, I wish thee well."
+      assert_status 200
+    end
+  end
+
+  module Compatibility
+    class WithoutLayoutController < ActionController::Base
+      self.view_paths = [ActionView::FixtureResolver.new(
+        "test/basic.html.erb" => "Hello from basic.html.erb",
+        "shared.html.erb"     => "Elastica"
+      )]
+
+      def with_forward_slash
+        render :template => "/test/basic"
+      end
+    end
+
+    class TestTemplateRenderWithForwardSlash < SimpleRouteCase
+      test "rendering a normal template with full path starting with a leading slash" do
+        get "/render_template/compatibility/without_layout/with_forward_slash"
+
+        assert_body "Hello from basic.html.erb"
+        assert_status 200
+      end
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
new file mode 100644
index 0000000000..804be79d17
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -0,0 +1,85 @@
+require 'abstract_unit'
+
+module Render
+  class BlankRenderController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render/blank_render/index.html.erb"                  => "Hello world!",
+      "render/blank_render/access_request.html.erb"         => "The request: <%= request.method.to_s.upcase %>",
+      "render/blank_render/access_action_name.html.erb"     => "Action Name: <%= action_name %>",
+      "render/blank_render/access_controller_name.html.erb" => "Controller Name: <%= controller_name %>"
+    )]
+
+    def index
+      render
+    end
+
+    def access_request
+      render :action => "access_request"
+    end
+
+    def render_action_name
+      render :action => "access_action_name"
+    end
+
+    private
+
+    def secretz
+      render :text => "FAIL WHALE!"
+    end
+  end
+
+  class DoubleRenderController < ActionController::Base
+    def index
+      render :text => "hello"
+      render :text => "world"
+    end
+  end
+
+  class RenderTest < SimpleRouteCase
+    test "render with blank" do
+      get "/render/blank_render"
+
+      assert_body "Hello world!"
+      assert_status 200
+    end
+
+    test "rendering more than once raises an exception" do
+      assert_raises(AbstractController::DoubleRenderError) do
+        get "/render/double_render", {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+  end
+
+  class TestOnlyRenderPublicActions < SimpleRouteCase
+    describe "Only public methods on actual controllers are callable actions"
+
+    test "raises an exception when a method of Object is called" do
+      assert_raises(AbstractController::ActionNotFound) do
+        get "/render/blank_render/clone", {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+
+    test "raises an exception when a private method is called" do
+      assert_raises(AbstractController::ActionNotFound) do
+        get "/render/blank_render/secretz", {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+  end
+  
+  class TestVariousObjectsAvailableInView < SimpleRouteCase
+    test "The request object is accessible in the view" do
+      get "/render/blank_render/access_request"
+      assert_body "The request: GET"
+    end
+
+    test "The action_name is accessible in the view" do
+      get "/render/blank_render/render_action_name"
+      assert_body "Action Name: render_action_name"
+    end
+
+    test "The controller_name is accessible in the view" do
+      get "/render/blank_render/access_controller_name"
+      assert_body "Controller Name: blank_render"
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_text_test.rb b/actionpack/test/controller/new_base/render_text_test.rb
new file mode 100644
index 0000000000..f5839ee16f
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_text_test.rb
@@ -0,0 +1,137 @@
+require 'abstract_unit'
+
+module RenderText
+  class SimpleController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new]
+    
+    def index
+      render :text => "hello david"
+    end
+  end
+
+  class WithLayoutController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.html.erb" => "<%= yield %>, I'm here!",
+      "layouts/greetings.html.erb"   => "<%= yield %>, I wish thee well.",
+      "layouts/ivar.html.erb"        => "<%= yield %>, <%= @ivar %>"
+    )]    
+    
+    def index
+      render :text => "hello david"
+    end
+    
+    def custom_code
+      render :text => "hello world", :status => 404
+    end
+    
+    def with_custom_code_as_string
+      render :text => "hello world", :status => "404 Not Found"
+    end
+    
+    def with_nil
+      render :text => nil
+    end
+    
+    def with_nil_and_status
+      render :text => nil, :status => 403
+    end
+
+    def with_false
+      render :text => false
+    end
+    
+    def with_layout_true
+      render :text => "hello world", :layout => true
+    end
+    
+    def with_layout_false
+      render :text => "hello world", :layout => false
+    end
+    
+    def with_layout_nil
+      render :text => "hello world", :layout => nil
+    end
+    
+    def with_custom_layout
+      render :text => "hello world", :layout => "greetings"
+    end
+    
+    def with_ivar_in_layout
+      @ivar = "hello world"
+      render :text => "hello world", :layout => "ivar"
+    end
+  end
+
+  class RenderTextTest < SimpleRouteCase
+    describe "Rendering text using render :text"
+
+    test "rendering text from a action with default options renders the text with the layout" do
+      get "/render_text/simple"
+      assert_body "hello david"
+      assert_status 200
+    end
+
+    test "rendering text from a action with default options renders the text without the layout" do
+      get "/render_text/with_layout"
+
+      assert_body "hello david"
+      assert_status 200
+    end
+
+    test "rendering text, while also providing a custom status code" do
+      get "/render_text/with_layout/custom_code"
+
+      assert_body "hello world"
+      assert_status 404
+    end
+
+    test "rendering text with nil returns an empty body padded for Safari" do
+      get "/render_text/with_layout/with_nil"
+
+      assert_body " "
+      assert_status 200
+    end
+
+    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+      get "/render_text/with_layout/with_nil_and_status"
+
+      assert_body " "
+      assert_status 403
+    end
+
+    test "rendering text with false returns the string 'false'" do
+      get "/render_text/with_layout/with_false"
+
+      assert_body "false"
+      assert_status 200
+    end
+
+    test "rendering text with :layout => true" do
+      get "/render_text/with_layout/with_layout_true"
+
+      assert_body "hello world, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering text with :layout => 'greetings'" do
+      get "/render_text/with_layout/with_custom_layout"
+
+      assert_body "hello world, I wish thee well."
+      assert_status 200
+    end
+
+    test "rendering text with :layout => false" do
+      get "/render_text/with_layout/with_layout_false"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering text with :layout => nil" do
+      get "/render_text/with_layout/with_layout_nil"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_xml_test.rb b/actionpack/test/controller/new_base/render_xml_test.rb
new file mode 100644
index 0000000000..d044738a78
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_xml_test.rb
@@ -0,0 +1,11 @@
+require 'abstract_unit'
+
+module RenderXml
+  
+  # This has no layout and it works
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_xml/basic/with_render_erb" => "Hello world!"
+    )]
+  end
+end