3 files changed, 26 insertions, 30 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index cc610b6d75..771df5a0b2 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -123,13 +123,13 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
 
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      middleware.use "ActionDispatch::ShowExceptions", ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
-      middleware.use "ActionDispatch::DebugExceptions"
-      middleware.use "ActionDispatch::Callbacks"
-      middleware.use "ActionDispatch::ParamsParser"
-      middleware.use "ActionDispatch::Cookies"
-      middleware.use "ActionDispatch::Flash"
-      middleware.use "Rack::Head"
+      middleware.use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
+      middleware.use ActionDispatch::DebugExceptions
+      middleware.use ActionDispatch::Callbacks
+      middleware.use ActionDispatch::ParamsParser
+      middleware.use ActionDispatch::Cookies
+      middleware.use ActionDispatch::Flash
+      middleware.use Rack::Head
       yield(middleware) if block_given?
     end
   end
diff --git a/actionpack/test/dispatch/middleware_stack/middleware_test.rb b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
index 6366d37aa4..28f9fa317b 100644
--- a/actionpack/test/dispatch/middleware_stack/middleware_test.rb
+++ b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
@@ -33,12 +33,6 @@ module ActionDispatch
         @stack = ActionDispatch::MiddlewareStack.new
       end
 
-      def test_string_class
-        stack = ActionDispatch::MiddlewareStack.new
-        stack.use Omg.name
-        assert_equal Omg, stack.first.klass
-      end
-
       def test_double_equal_works_with_classes
         k = Class.new
         stack.use k
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
index 948a690979..354e95cf30 100644
--- a/actionpack/test/dispatch/middleware_stack_test.rb
+++ b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -25,17 +25,21 @@ class MiddlewareStackTest < ActiveSupport::TestCase
   end
 
   test "use should push middleware as a string onto the stack" do
-    assert_difference "@stack.size" do
-      @stack.use "MiddlewareStackTest::BazMiddleware"
+    assert_deprecated do
+      assert_difference "@stack.size" do
+        @stack.use "MiddlewareStackTest::BazMiddleware"
+      end
+      assert_equal BazMiddleware, @stack.last.klass
     end
-    assert_equal BazMiddleware, @stack.last.klass
   end
 
   test "use should push middleware as a symbol onto the stack" do
-    assert_difference "@stack.size" do
-      @stack.use :"MiddlewareStackTest::BazMiddleware"
+    assert_deprecated do
+      assert_difference "@stack.size" do
+        @stack.use :"MiddlewareStackTest::BazMiddleware"
+      end
+      assert_equal BazMiddleware, @stack.last.klass
     end
-    assert_equal BazMiddleware, @stack.last.klass
   end
 
   test "use should push middleware class with arguments onto the stack" do
@@ -88,8 +92,10 @@ class MiddlewareStackTest < ActiveSupport::TestCase
   end
 
   test "unshift adds a new middleware at the beginning of the stack" do
-    @stack.unshift :"MiddlewareStackTest::BazMiddleware"
-    assert_equal BazMiddleware, @stack.first.klass
+    assert_deprecated do
+      @stack.unshift :"MiddlewareStackTest::BazMiddleware"
+      assert_equal BazMiddleware, @stack.first.klass
+    end
   end
 
   test "raise an error on invalid index" do
@@ -103,15 +109,11 @@ class MiddlewareStackTest < ActiveSupport::TestCase
   end
 
   test "lazy evaluates middleware class" do
-    assert_difference "@stack.size" do
-      @stack.use "MiddlewareStackTest::BazMiddleware"
+    assert_deprecated do
+      assert_difference "@stack.size" do
+        @stack.use "MiddlewareStackTest::BazMiddleware"
+      end
+      assert_equal BazMiddleware, @stack.last.klass
     end
-    assert_equal BazMiddleware, @stack.last.klass
-  end
-
-  test "lazy compares so unloaded constants are not loaded" do
-    @stack.use "UnknownMiddleware"
-    @stack.use :"MiddlewareStackTest::BazMiddleware"
-    assert @stack.include?("::MiddlewareStackTest::BazMiddleware")
   end
 end