Merge pull request #4879 from kennyj/fix_4873

Fix GH #4873. Allow swapping same class middleware.
rails · Feb 4, 2012 · 9cb0e12 · 9cb0e12
1 parent 9aa4c6d
commit 9cb0e12
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -93,8 +93,9 @@ def insert_after(index, *args, &block)
     end
 
     def swap(target, *args, &block)
-      insert_before(target, *args, &block)
+      index = assert_index(target, :before)
-      delete(target)
+      insert(index, *args, &block)
+      middlewares.delete_at(index + 1)
     end
 
     def delete(target)

diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -81,6 +81,12 @@ def setup
     assert_equal BazMiddleware, @stack[0].klass
   end
 
+  test "swaps one middleware out for same middleware class" do
+    assert_equal FooMiddleware, @stack[0].klass
+    @stack.swap(FooMiddleware, FooMiddleware, Proc.new { |env| [500, {}, ['error!']] })
+    assert_equal FooMiddleware, @stack[0].klass
+  end
+
   test "raise an error on invalid index" do
     assert_raise RuntimeError do
       @stack.insert("HiyaMiddleware", BazMiddleware)