3 files changed, 5 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 0430ce3b9a..90e2ae6802 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -87,7 +87,7 @@ module ActionDispatch
       middlewares.freeze.reverse.inject(app) { |a, e| e.build(a) }
     end
 
-  protected
+    private
 
     def assert_index(index, where)
       index = get_class index
@@ -96,8 +96,6 @@ module ActionDispatch
       i
     end
 
-    private
-
     def get_class(klass)
       if klass.is_a?(String) || klass.is_a?(Symbol)
         classcache = ActiveSupport::Dependencies::Reference
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 69aff7e518..ce5ecb9be7 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -381,13 +381,11 @@ class ThreadsController  < ResourcesController; end
 class MessagesController < ResourcesController; end
 class CommentsController < ResourcesController; end
 class ReviewsController < ResourcesController; end
-class LogosController < ResourcesController; end
 
 class AccountsController <  ResourcesController; end
 class AdminController   <  ResourcesController; end
 class ProductsController < ResourcesController; end
 class ImagesController < ResourcesController; end
-class PreferencesController < ResourcesController; end
 
 module Backoffice
   class ProductsController < ResourcesController; end
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 771bd6c565..4490abf7b2 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -519,9 +519,9 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_should_create_multiple_singleton_resource_routes
-    with_singleton_resources :account, :logo do
+    with_singleton_resources :account, :product do
       assert_singleton_restful_for :account
-      assert_singleton_restful_for :logo
+      assert_singleton_restful_for :product
     end
   end
 
@@ -1070,8 +1070,8 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_singleton_resource_name_is_not_singularized
-    with_singleton_resources(:preferences) do
-      assert_singleton_restful_for :preferences
+    with_singleton_resources(:products) do
+      assert_singleton_restful_for :products
     end
   end