2 files changed, 18 insertions, 6 deletions
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..42356be1ea 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