11 files changed, 474 insertions, 99 deletions

diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 9c89f1334d..e19612eace 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -264,6 +264,22 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_setting_flash_does_not_raise_in_following_requests
+    with_test_route_set do
+      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
+      get '/set_flash', nil, env
+      get '/set_flash', nil, env
+    end
+  end
+
+  def test_setting_flash_now_does_not_raise_in_following_requests
+    with_test_route_set do
+      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
+      get '/set_flash_now', nil, env
+      get '/set_flash_now', nil, env
+    end
+  end
+
   def test_setting_flash_raises_after_stream_back_to_client_even_with_an_empty_flash
     with_test_route_set do
       env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
@@ -294,7 +310,6 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-
   private
 
     # Overwrite get to send SessionSecret in env hash
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index ddfa3df552..5d7a51e902 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -4,6 +4,8 @@ require "action_controller/log_subscriber"
 
 module Another
   class LogSubscribersController < ActionController::Base
+    wrap_parameters :person, :only => :name, :format => :json
+
     def show
       render :nothing => true
     end
@@ -95,6 +97,15 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_equal 'Parameters: {"id"=>"10"}', logs[1]
   end
 
+  def test_process_action_with_wrapped_parameters
+    @request.env['CONTENT_TYPE'] = 'application/json'
+    post :show, :id => '10', :name => 'jose'
+    wait
+
+    assert_equal 3, logs.size
+    assert_match '"person"=>{"name"=>"jose"}', logs[1]
+  end
+
   def test_process_action_with_view_runtime
     get :show
     wait
diff --git a/actionpack/test/controller/new_base/render_context_test.rb b/actionpack/test/controller/new_base/render_context_test.rb
new file mode 100644
index 0000000000..f41b14d5d6
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_context_test.rb
@@ -0,0 +1,54 @@
+require 'abstract_unit'
+
+# This is testing the decoupling of view renderer and view context
+# by allowing the controller to be used as view context. This is
+# similar to the way sinatra renders templates.
+module RenderContext
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_context/basic/hello_world.html.erb" => "<%= @value %> from <%= self.__controller_method__ %>",
+      "layouts/basic.html.erb" => "?<%= yield %>?"
+    )]
+
+    # 1) Include ActionView::Context to bring the required dependencies
+    include ActionView::Context
+
+    # 2) Call _prepare_context that will do the required initialization
+    before_filter :_prepare_context
+
+    def hello_world
+      @value = "Hello"
+      render :action => "hello_world", :layout => false
+    end
+
+    def with_layout
+      @value = "Hello"
+      render :action => "hello_world", :layout => "basic"
+    end
+
+    protected
+
+    # 3) Set view_context to self
+    def view_context
+      self
+    end
+
+    def __controller_method__
+      "controller context!"
+    end
+  end
+
+  class RenderContextTest < Rack::TestCase
+    test "rendering using the controller as context" do
+      get "/render_context/basic/hello_world"
+      assert_body "Hello from controller context!"
+      assert_status 200
+    end
+
+    test "rendering using the controller as context with layout" do
+      get "/render_context/basic/with_layout"
+      assert_body "?Hello from controller context!?"
+      assert_status 200
+    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
index 3bb3016fdb..1e2191d417 100644
--- a/actionpack/test/controller/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/controller/new_base/render_implicit_action_test.rb
@@ -33,10 +33,10 @@ module RenderImplicitAction
       assert_status 200
     end
 
-    test "action_method? returns true for implicit actions" do
-      assert SimpleController.new.action_method?(:hello_world)
-      assert SimpleController.new.action_method?(:"hyphen-ated")
-      assert SimpleController.new.action_method?(:not_implemented)
+    test "available_action? returns true for implicit actions" do
+      assert SimpleController.new.available_action?(:hello_world)
+      assert SimpleController.new.available_action?(:"hyphen-ated")
+      assert SimpleController.new.available_action?(:not_implemented)
     end
   end
 end
diff --git a/actionpack/test/controller/new_base/render_once_test.rb b/actionpack/test/controller/new_base/render_once_test.rb
deleted file mode 100644
index 175abf8a7e..0000000000
--- a/actionpack/test/controller/new_base/render_once_test.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'abstract_unit'
-
-module RenderTemplate
-  class RenderOnceController < ActionController::Base
-    layout false
-
-    RESOLVER = ActionView::FixtureResolver.new(
-      "test/a.html.erb"       => "a",
-      "test/b.html.erb"       => "<>",
-      "test/c.html.erb"       => "c",
-      "test/one.html.erb"     => "<%= render :once => 'result' %>",
-      "test/two.html.erb"     => "<%= render :once => 'result' %>",
-      "test/three.html.erb"   => "<%= render :once => 'result' %>",
-      "test/result.html.erb"  => "YES!",
-      "other/result.html.erb" => "NO!",
-      "layouts/test.html.erb" => "l<%= yield %>l"
-    )
-
-    self.view_paths = [RESOLVER]
-
-    def _prefixes
-      %w(test)
-    end
-
-    def multiple
-      render :once => %w(a b c)
-    end
-
-    def once
-      render :once => %w(one two three)
-    end
-
-    def duplicate
-      render :once => %w(a a a)
-    end
-
-    def with_layout
-      render :once => %w(a b c), :layout => "test"
-    end
-
-    def with_prefix
-      render :once => "result", :prefixes => %w(other)
-    end
-
-    def with_nil_prefix
-      render :once => "test/result", :prefixes => []
-    end
-  end
-
-  module Tests
-    def test_mutliple_arguments_get_all_rendered
-      get :multiple
-      assert_response "a\n<>\nc"
-    end
-
-    def test_referenced_templates_get_rendered_once
-      get :once
-      assert_response "YES!\n\n"
-    end
-
-    def test_duplicated_templates_get_rendered_once
-      get :duplicate
-      assert_response "a"
-    end
-
-    def test_layout_wraps_all_rendered_templates
-      get :with_layout
-      assert_response "la\n<>\ncl"
-    end
-
-    def test_with_prefix_option
-      get :with_prefix
-      assert_response "NO!"
-    end
-
-    def test_with_nil_prefix_option
-      get :with_nil_prefix
-      assert_response "YES!"
-    end
-  end
-
-  class TestRenderOnce < Rack::TestCase
-    testing RenderTemplate::RenderOnceController
-    include Tests
-  end
-end
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
new file mode 100644
index 0000000000..48cf0ab9cb
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -0,0 +1,114 @@
+require 'abstract_unit'
+
+module RenderStreaming
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_streaming/basic/hello_world.html.erb" => "Hello world",
+      "render_streaming/basic/boom.html.erb" => "<%= nil.invalid! %>",
+      "layouts/application.html.erb" => "<%= yield %>, I'm here!",
+      "layouts/boom.html.erb" => "<body class=\"<%= nil.invalid! %>\"<%= yield %></body>"
+    )]
+
+    layout "application"
+    stream :only => [:hello_world, :skip]
+
+    def hello_world
+    end
+
+    def layout_exception
+      render :action => "hello_world", :stream => true, :layout => "boom"
+    end
+
+    def template_exception
+      render :action => "boom", :stream => true
+    end
+
+    def skip
+      render :action => "hello_world", :stream => false
+    end
+
+    def explicit
+      render :action => "hello_world", :stream => true
+    end
+
+    def no_layout
+      render :action => "hello_world", :stream => true, :layout => false
+    end
+
+    def explicit_cache
+      headers["Cache-Control"] = "private"
+      render :action => "hello_world", :stream => true
+    end
+  end
+
+  class StreamingTest < Rack::TestCase
+    test "rendering with streaming enabled at the class level" do
+      get "/render_streaming/basic/hello_world"
+      assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with streaming given to render" do
+      get "/render_streaming/basic/explicit"
+      assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with streaming do not override explicit cache control given to render" do
+      get "/render_streaming/basic/explicit_cache"
+      assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+      assert_streaming! "private"
+    end
+
+    test "rendering with streaming no layout" do
+      get "/render_streaming/basic/no_layout"
+      assert_body "b\r\nHello world\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "skip rendering with streaming at render level" do
+      get "/render_streaming/basic/skip"
+      assert_body "Hello world, I'm here!"
+    end
+
+    test "rendering with layout exception" do
+      get "/render_streaming/basic/layout_exception"
+      assert_body "d\r\n<body class=\"\r\n4e\r\n\"><script type=\"text/javascript\">window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with template exception" do
+      get "/render_streaming/basic/template_exception"
+      assert_body "4e\r\n\"><script type=\"text/javascript\">window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with template exception logs the exception" do
+      io = StringIO.new
+      _old, ActionController::Base.logger = ActionController::Base.logger, Logger.new(io)
+
+      begin
+        get "/render_streaming/basic/template_exception"
+        io.rewind
+        assert_match "(undefined method `invalid!' for nil:NilClass)", io.read
+      ensure
+        ActionController::Base.logger = _old
+      end
+    end
+
+    test "do not stream on HTTP/1.0" do
+      get "/render_streaming/basic/hello_world", nil, "HTTP_VERSION" => "HTTP/1.0"
+      assert_body "Hello world, I'm here!"
+      assert_status 200
+      assert_equal "22", headers["Content-Length"]
+      assert_equal nil, headers["Transfer-Encoding"]
+    end
+
+    def assert_streaming!(cache="no-cache")
+      assert_status 200
+      assert_equal nil, headers["Content-Length"]
+      assert_equal "chunked", headers["Transfer-Encoding"]
+      assert_equal cache, headers["Cache-Control"]
+    end
+  end
+end if defined?(Fiber)
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index d6062bfa8c..60468bf5c7 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -81,8 +81,7 @@ module Render
   end
 
   class TestOnlyRenderPublicActions < Rack::TestCase
-    describe "Only public methods on actual controllers are callable actions"
-
+    # 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
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
new file mode 100644
index 0000000000..548cd02dc0
--- /dev/null
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -0,0 +1,246 @@
+require 'abstract_unit'
+
+module Admin; class User; end; end
+
+class ParamsWrapperTest < ActionController::TestCase
+  class UsersController < ActionController::Base
+    class << self
+      attr_accessor :last_parameters
+    end
+
+    def parse
+      self.class.last_parameters = request.params.except(:controller, :action)
+      head :ok
+    end
+  end
+
+  class User; end
+  class Person; end
+
+  tests UsersController
+
+  def teardown
+    UsersController.last_parameters = nil
+  end
+
+  def test_derived_name_from_controller
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_specify_wrapper_name
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_specify_wrapper_model
+    with_default_wrapper_options do
+      UsersController.wrap_parameters Person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_specify_only_option
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :only => :username
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_specify_except_option
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :except => :title
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_specify_both_wrapper_name_and_only_option
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :person, :only => :username
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_not_enabled_format
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/xml'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer' })
+    end
+  end
+
+  def test_wrap_parameters_false
+    with_default_wrapper_options do
+      UsersController.wrap_parameters false
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer' })
+    end
+  end
+
+  def test_specify_format
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :format => :xml
+
+      @request.env['CONTENT_TYPE'] = 'application/xml'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }})
+    end
+  end
+
+  def test_not_wrap_reserved_parameters
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'authenticity_token' => 'pwned', '_method' => 'put', 'utf8' => '&#9731;', 'username' => 'sikachu' }
+      assert_parameters({ 'authenticity_token' => 'pwned', '_method' => 'put', 'utf8' => '&#9731;', 'username' => 'sikachu', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_no_double_wrap_if_key_exists
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'user' => { 'username' => 'sikachu' }}
+      assert_parameters({ 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_nested_params
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'person' => { 'username' => 'sikachu' }}
+      assert_parameters({ 'person' => { 'username' => 'sikachu' }, 'user' => {'person' => { 'username' => 'sikachu' }}})
+    end
+  end
+
+  def test_derived_wrapped_keys_from_matching_model
+    User.expects(:respond_to?).with(:column_names).returns(true)
+    User.expects(:column_names).returns(["username"])
+
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_derived_wrapped_keys_from_specified_model
+    with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:column_names).returns(true)
+      Person.expects(:column_names).returns(["username"])
+
+      UsersController.wrap_parameters Person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  private
+    def with_default_wrapper_options(&block)
+      @controller.class._wrapper_options = {:format => [:json]}
+      @controller.class.inherited(@controller.class)
+      yield
+    end
+
+    def assert_parameters(expected)
+      assert_equal expected, UsersController.last_parameters
+    end
+end
+
+class NamespacedParamsWrapperTest < ActionController::TestCase
+  module Admin
+    class UsersController < ActionController::Base
+      class << self
+        attr_accessor :last_parameters
+      end
+
+      def parse
+        self.class.last_parameters = request.params.except(:controller, :action)
+        head :ok
+      end
+    end
+  end
+
+  class Sample
+    def self.column_names
+      ["username"]
+    end
+  end
+
+  tests Admin::UsersController
+
+  def teardown
+    Admin::UsersController.last_parameters = nil
+  end
+
+  def test_derived_name_from_controller
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({'username' => 'sikachu', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+
+  def test_namespace_lookup_from_model
+    Admin.const_set(:User, Class.new(Sample))
+    begin
+      with_default_wrapper_options do
+        @request.env['CONTENT_TYPE'] = 'application/json'
+        post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+        assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+      end
+    ensure
+      Admin.send :remove_const, :User
+    end
+  end
+
+  def test_hierarchy_namespace_lookup_from_model
+    # Make sure that we cleanup ::Admin::User
+    admin_user_constant = ::Admin::User
+    ::Admin.send :remove_const, :User
+
+    Object.const_set(:User, Class.new(Sample))
+    begin
+      with_default_wrapper_options do
+        @request.env['CONTENT_TYPE'] = 'application/json'
+        post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+        assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+      end
+    ensure
+      Object.send :remove_const, :User
+      ::Admin.const_set(:User, admin_user_constant)
+    end
+  end
+
+  private
+    def with_default_wrapper_options(&block)
+      @controller.class._wrapper_options = {:format => [:json]}
+      @controller.class.inherited(@controller.class)
+      yield
+    end
+
+    def assert_parameters(expected)
+      assert_equal expected, Admin::UsersController.last_parameters
+    end
+end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 18cf944f46..aa9d193436 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -92,6 +92,12 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     @rs.clear!
   end
 
+  def test_draw_with_block_arity_one_raises
+    assert_raise(RuntimeError) do
+      @rs.draw { |map| map.match '/:controller(/:action(/:id))' }
+    end
+  end
+
   def test_default_setup
     @rs.draw { match '/:controller(/:action(/:id))' }
     assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index edda0d0a30..5896222a0a 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -493,6 +493,18 @@ XML
     )
   end
 
+  def test_params_passing_with_frozen_values
+    assert_nothing_raised do
+      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze
+    end
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_test/test', 'action' => 'test_params',
+       'frozen' => 'icy', 'frozens' => ['icy']},
+      parsed_params
+    )
+  end
+
   def test_id_converted_to_string
     get :test_params, :id => 20, :foo => Object.new
     assert_kind_of String, @request.path_parameters['id']
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 9280a1c2d3..3de1849db8 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -131,8 +131,8 @@ class ViewLoadPathsTest < ActionController::TestCase
     assert_equal "Hello overridden world!", @response.body
   end
 
-  def test_override_view_paths_with_custom_resolver
-    resolver_class = Class.new(ActionView::PathResolver) do
+  def test_decorate_view_paths_with_custom_resolver
+    decorator_class = Class.new(ActionView::PathResolver) do
       def initialize(path_set)
         @path_set = path_set
       end
@@ -140,7 +140,7 @@ class ViewLoadPathsTest < ActionController::TestCase
       def find_all(*args)
         @path_set.find_all(*args).collect do |template|
           ::ActionView::Template.new(
-            "Customized body",
+            "Decorated body",
             template.identifier,
             template.handler,
             {
@@ -152,12 +152,12 @@ class ViewLoadPathsTest < ActionController::TestCase
       end
     end
 
-    resolver = resolver_class.new(TestController.view_paths)
-    TestController.view_paths = ActionView::PathSet.new.push(resolver)
+    decorator = decorator_class.new(TestController.view_paths)
+    TestController.view_paths = ActionView::PathSet.new.push(decorator)
 
     get :hello_world
     assert_response :success
-    assert_equal "Customized body", @response.body
+    assert_equal "Decorated body", @response.body
   end
 
   def test_inheritance
@@ -179,4 +179,8 @@ class ViewLoadPathsTest < ActionController::TestCase
     assert_nothing_raised { C.append_view_path 'c/path' }
     assert_paths C, "c/path"
   end
+  
+  def test_lookup_context_accessor
+    assert_equal ["test"], TestController.new.lookup_context.prefixes
+  end
 end