Merge pull request #42655 from ghiculescu/middleware-delete-raise

Deleting an item from the Middleware stack should raise if the item is not found

actionpack/CHANGELOG.md

@@ -1,3 +1,10 @@
+*   Deleting an item from the Middleware stack will raise if the item is not found
+
+    Previously, calling `config.middleware.delete(ItemNotInMiddleware)` would fail silently.
+    Now it will raise, same as `config.middleware.move(0, ItemNotInMiddleware)` does.
+
+    *Alex Ghiculescu*
+
 *   OpenSSL constants are now used for Digest computations.
 
     *Dirkjan Bussink*

actionpack/lib/action_dispatch/middleware/stack.rb

@@ -130,7 +130,7 @@ def swap(target, *args, &block)
     ruby2_keywords(:swap)
 
     def delete(target)
-      middlewares.delete_if { |m| m.name == target.name }
+      middlewares.reject! { |m| m.name == target.name } || (raise "No such middleware to delete: #{target.inspect}")
     end
 
     def move(target, source)

actionpack/test/dispatch/middleware_stack_test.rb

@@ -105,6 +105,12 @@ def test_delete_works
     end
   end
 
+  test "delete requires the middleware to be in the stack" do
+    assert_raises RuntimeError do
+      @stack.delete(BazMiddleware)
+    end
+  end
+
   test "move preserves the arguments of the moved middleware" do
     @stack.use BazMiddleware, true, foo: "bar"
     @stack.move_before(FooMiddleware, BazMiddleware)