From 9c1e48eaea921efa67fbeed1ff1876dc710f8fd2 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 23 Dec 2008 13:36:05 -0600
Subject: ActionController::VerbPiggybacking middleware

---
 actionpack/test/controller/rack_test.rb    | 23 -----------------------
 actionpack/test/controller/request_test.rb |  6 ++----
 2 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index f58a9c53e5..406e2b2818 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -187,29 +187,6 @@ class RackRequestContentTypeTest < BaseRackTest
   end
 end
 
-class RackRequestMethodTest < BaseRackTest
-  def test_get
-    assert_equal :get, @request.request_method
-  end
-
-  def test_post
-    @request.env['REQUEST_METHOD'] = 'POST'
-    assert_equal :post, @request.request_method
-  end
-
-  def test_put
-    set_content_data '_method=put'
-
-    assert_equal :put, @request.request_method
-  end
-
-  def test_delete
-    set_content_data '_method=delete'
-
-    assert_equal :delete, @request.request_method
-  end
-end
-
 class RackRequestNeedsRewoundTest < BaseRackTest
   def test_body_should_be_rewound
     data = 'foo'
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index c2c35ad6fe..3e10a4665e 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -303,18 +303,16 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   def test_allow_method_hacking_on_post
-    self.request_method = :post
     [:get, :head, :options, :put, :post, :delete].each do |method|
-      @request.instance_eval { @parameters = { :_method => method.to_s } ; @request_method = nil }
+      self.request_method = method
       @request.request_method(true)
       assert_equal(method == :head ? :get : method, @request.method)
     end
   end
 
   def test_invalid_method_hacking_on_post_raises_exception
-    self.request_method = :post
-    @request.instance_eval { @parameters = { :_method => :random_method } ; @request_method = nil }
     assert_raises(ActionController::UnknownHttpMethod) do
+      self.request_method = :_random_method
       @request.request_method(true)
     end
   end
-- 
cgit v1.2.3