2 files changed, 48 insertions, 18 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 7556f984f2..754ac144cc 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -381,19 +381,14 @@ class CollectionCacheController < ActionController::Base
     render 'index'
   end
 
-  def index_explicit_render
+  def index_explicit_render_in_controller
     @customers = [Customer.new('david', 1)]
-    render partial: 'customers/customer', collection: @customers
+    render partial: 'customers/customer', collection: @customers, cached: true
   end
 
   def index_with_comment
     @customers = [Customer.new('david', 1)]
-    render partial: 'customers/commented_customer', collection: @customers, as: :customer
-  end
-
-  def index_with_callable_cache_key
-    @customers = [Customer.new('david', 1)]
-    render @customers, cache: -> customer { 'cached_david' }
+    render partial: 'customers/commented_customer', collection: @customers, as: :customer, cached: true
   end
 end
 
@@ -404,7 +399,7 @@ class AutomaticCollectionCacheTest < ActionController::TestCase
     @controller.perform_caching = true
     @controller.partial_rendered_times = 0
     @controller.cache_store = ActiveSupport::Cache::MemoryStore.new
-    ActionView::PartialRenderer.collection_cache = @controller.cache_store
+    ActionView::PartialRenderer.collection_cache = ActiveSupport::Cache::MemoryStore.new
   end
 
   def test_collection_fetches_cached_views
@@ -427,7 +422,7 @@ class AutomaticCollectionCacheTest < ActionController::TestCase
   end
 
   def test_explicit_render_call_with_options
-    get :index_explicit_render
+    get :index_explicit_render_in_controller
 
     assert_select ':root', "david, 1"
   end
@@ -440,12 +435,6 @@ class AutomaticCollectionCacheTest < ActionController::TestCase
     assert_equal 1, @controller.partial_rendered_times
   end
 
-  def test_caching_with_callable_cache_key
-    get :index_with_callable_cache_key
-    assert_customer_cached 'cached_david', 'david, 1'
-    assert_customer_cached 'david/1', 'david, 1'
-  end
-
   private
     def assert_customer_cached(key, content)
       assert_match content,
diff --git a/actionpack/test/controller/parameters/accessors_test.rb b/actionpack/test/controller/parameters/accessors_test.rb
index 08b3d81bf0..4ef5bed30d 100644
--- a/actionpack/test/controller/parameters/accessors_test.rb
+++ b/actionpack/test/controller/parameters/accessors_test.rb
@@ -129,10 +129,51 @@ class ParametersAccessorsTest < ActiveSupport::TestCase
     assert_not @params[:person].values_at(:name).first.permitted?
   end
 
-  test "equality with another hash works" do
+  test "equality with a hash is deprecated" do
     hash1 = { foo: :bar }
     params1 = ActionController::Parameters.new(hash1)
-    assert(params1 == hash1)
+    assert_deprecated("will be removed in Rails 5.1") do
+      assert(params1 == hash1)
+    end
+  end
+
+  test "is equal to Parameters instance with same params" do
+    params1 = ActionController::Parameters.new(a: 1, b: 2)
+    params2 = ActionController::Parameters.new(a: 1, b: 2)
+    assert(params1 == params2)
+  end
+
+  test "is equal to Parameters instance with same permitted params" do
+    params1 = ActionController::Parameters.new(a: 1, b: 2).permit(:a)
+    params2 = ActionController::Parameters.new(a: 1, b: 2).permit(:a)
+    assert(params1 == params2)
+  end
+
+  test "is equal to Parameters instance with same different source params, but same permitted params" do
+    params1 = ActionController::Parameters.new(a: 1, b: 2).permit(:a)
+    params2 = ActionController::Parameters.new(a: 1, c: 3).permit(:a)
+    assert(params1 == params2)
+    assert(params2 == params1)
+  end
+
+  test 'is not equal to an unpermitted Parameters instance with same params' do
+    params1 = ActionController::Parameters.new(a: 1).permit(:a)
+    params2 = ActionController::Parameters.new(a: 1)
+    assert(params1 != params2)
+    assert(params2 != params1)
+  end
+
+  test "is not equal to Parameters instance with different permitted params" do
+    params1 = ActionController::Parameters.new(a: 1, b: 2).permit(:a, :b)
+    params2 = ActionController::Parameters.new(a: 1, b: 2).permit(:a)
+    assert(params1 != params2)
+    assert(params2 != params1)
+  end
+
+  test "equality with simple types works" do
+    assert(@params != 'Hello')
+    assert(@params != 42)
+    assert(@params != false)
   end
 
   test "inspect shows both class name and parameters" do