1 files changed, 50 insertions, 17 deletions
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
index 948a690979..a8c8e0784f 100644
--- a/actionpack/test/dispatch/middleware_stack_test.rb
+++ b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -4,6 +4,7 @@ class MiddlewareStackTest < ActiveSupport::TestCase
   class FooMiddleware; end
   class BarMiddleware; end
   class BazMiddleware; end
+  class HiyaMiddleware; end
   class BlockMiddleware
     attr_reader :block
     def initialize(&block)
@@ -17,6 +18,20 @@ class MiddlewareStackTest < ActiveSupport::TestCase
     @stack.use BarMiddleware
   end
 
+  def test_delete_with_string_is_deprecated
+    assert_deprecated do
+      assert_difference "@stack.size", -1 do
+        @stack.delete FooMiddleware.name
+      end
+    end
+  end
+
+  def test_delete_works
+    assert_difference "@stack.size", -1 do
+      @stack.delete FooMiddleware
+    end
+  end
+
   test "use should push middleware as class onto the stack" do
     assert_difference "@stack.size" do
       @stack.use BazMiddleware
@@ -25,17 +40,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,30 +107,44 @@ 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
     assert_raise RuntimeError do
-      @stack.insert("HiyaMiddleware", BazMiddleware)
+      @stack.insert(HiyaMiddleware, BazMiddleware)
     end
 
     assert_raise RuntimeError do
-      @stack.insert_after("HiyaMiddleware", BazMiddleware)
+      @stack.insert_after(HiyaMiddleware, BazMiddleware)
     end
   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")
+  test "can check if Middleware are equal - Class" do
+    assert_equal @stack.last, BarMiddleware
+  end
+
+  test "includes a class" do
+    assert_equal true, @stack.include?(BarMiddleware)
+  end
+
+  test "can check if Middleware are equal - Middleware" do
+    assert_equal @stack.last, @stack.last
+  end
+
+  test "includes a middleware" do
+    assert_equal true, @stack.include?(ActionDispatch::MiddlewareStack::Middleware.new(BarMiddleware, nil, nil))
   end
 end