Skip to content

Commit

Permalink
Changed response from request.request_method to match with rails3.bet…
Browse files Browse the repository at this point in the history
…a3 expects
  • Loading branch information
gus committed Jun 4, 2010
1 parent 3b0b9c5 commit 7c0c8e4
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions test/action_controller/delete_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
context "without parameters" do
setup { delete "/rooms/destroy" }

asserts("request method") { request.request_method }.equals(:delete)
asserts("request method") { request.request_method }.equals("DELETE")
asserts("action name") { action_name }.equals("destroy")
asserts("response status") { response.status }.equals(200)
asserts("response body") { response.body }.equals { "destroyed #{controller.params.inspect}" }
Expand All @@ -28,7 +28,7 @@
context "with parameters" do
setup { delete "/rooms/destroy", {:momma => "loves you", "love_you_too" => "mom"} }

asserts("request method") { request.request_method }.equals(:delete)
asserts("request method") { request.request_method }.equals("DELETE")
asserts("action name") { action_name }.equals("destroy")
asserts("response status") { response.status }.equals(200)

Expand Down
2 changes: 1 addition & 1 deletion test/action_controller/get_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
asserts("action name") { action_name }.equals("index")
asserts("response status") { response.status }.equals(200)
asserts("response body") { response.body }.equals("foo")
asserts("request method") { request.request_method }.equals(:get)
asserts("request method") { request.request_method }.equals("GET")

context "response headers" do
setup { response.headers.keys }
Expand Down
4 changes: 2 additions & 2 deletions test/action_controller/post_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
context "without parameters" do
setup { post "/rooms/create" }

asserts("request method") { request.request_method }.equals(:post)
asserts("request method") { request.request_method }.equals("POST")
asserts("action name") { action_name }.equals("create")
asserts("response status") { response.status }.equals(200)
asserts("response body") { response.body }.equals { "created #{controller.params.inspect}" }
Expand All @@ -28,7 +28,7 @@
context "with parameters" do
setup { post "/rooms/create", {:momma => "loves you", "love_you_too" => "mom"} }

asserts("request method") { request.request_method }.equals(:post)
asserts("request method") { request.request_method }.equals("POST")
asserts("action name") { action_name }.equals("create")
asserts("response status") { response.status }.equals(200)

Expand Down
4 changes: 2 additions & 2 deletions test/action_controller/put_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
context "without parameters" do
setup { put "/rooms/update" }

asserts("request method") { request.request_method }.equals(:put)
asserts("request method") { request.request_method }.equals("PUT")
asserts("action name") { action_name }.equals("update")
asserts("response status") { response.status }.equals(200)
asserts("response body") { response.body }.equals { "updated #{controller.params.inspect}" }
Expand All @@ -28,7 +28,7 @@
context "with parameters" do
setup { put "/rooms/update", {:momma => "loves you", "love_you_too" => "mom"} }

asserts("request method") { request.request_method }.equals(:put)
asserts("request method") { request.request_method }.equals("PUT")
asserts("action name") { action_name }.equals("update")
asserts("response status") { response.status }.equals(200)

Expand Down
4 changes: 2 additions & 2 deletions test/action_controller/restful_delete_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
context GremlinsController do
setup { delete("/gremlins/2") }

asserts("request method") { request.request_method }.equals(:delete)
asserts("request method") { request.request_method }.equals("DELETE")
asserts("controller name") { controller.controller_name }.equals("gremlins")
asserts("action name") { controller.action_name }.equals("destroy")
asserts("id param") { controller.params["id"] }.equals("2")
Expand All @@ -15,7 +15,7 @@
context PartiesController do
setup { delete("/gremlins/2/parties/3", "foo" => "bar") }

asserts("request method") { request.request_method }.equals(:delete)
asserts("request method") { request.request_method }.equals("DELETE")
asserts("controller name") { controller.controller_name }.equals("parties")
asserts("action name") { controller.action_name }.equals("destroy")

Expand Down
2 changes: 2 additions & 0 deletions test/action_controller/restful_get_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
context GremlinsController do
setup { get("/gremlins/1") }

asserts("request method") { request.request_method }.equals("GET")
asserts("controller name") { controller.controller_name }.equals("gremlins")
asserts("action name") { controller.action_name }.equals("show")
asserts("id param") { controller.params["id"] }.equals("1")
Expand All @@ -14,6 +15,7 @@
context PartiesController do
setup { get("/gremlins/1/parties/2") }

asserts("request method") { request.request_method }.equals("GET")
asserts("controller name") { controller.controller_name }.equals("parties")
asserts("action name") { controller.action_name }.equals("show")
asserts("gremlin_id param") { controller.params["gremlin_id"] }.equals("1")
Expand Down
4 changes: 2 additions & 2 deletions test/action_controller/restful_post_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
context GremlinsController do
setup { post("/gremlins", :id => 2) }

asserts("request method") { request.request_method }.equals(:post)
asserts("request method") { request.request_method }.equals("POST")
asserts("controller name") { controller.controller_name }.equals("gremlins")
asserts("action name") { controller.action_name }.equals("create")
asserts("id param") { controller.params["id"] }.equals("2")
Expand All @@ -15,7 +15,7 @@
context PartiesController do
setup { post("/gremlins/2/parties", "id" => 3) }

asserts("request method") { request.request_method }.equals(:post)
asserts("request method") { request.request_method }.equals("POST")
asserts("controller name") { controller.controller_name }.equals("parties")
asserts("action name") { controller.action_name }.equals("create")
asserts("gremlin_id param") { controller.params["gremlin_id"] }.equals("2")
Expand Down
4 changes: 2 additions & 2 deletions test/action_controller/restful_put_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
context GremlinsController do
setup { put("/gremlins/2") }

asserts("request method") { request.request_method }.equals(:put)
asserts("request method") { request.request_method }.equals("PUT")
asserts("controller name") { controller.controller_name }.equals("gremlins")
asserts("action name") { controller.action_name }.equals("update")
asserts("id param") { controller.params["id"] }.equals("2")
Expand All @@ -15,7 +15,7 @@
context PartiesController do
setup { put("/gremlins/2/parties/3", "foo" => "bar") }

asserts("request method") { request.request_method }.equals(:put)
asserts("request method") { request.request_method }.equals("PUT")
asserts("controller name") { controller.controller_name }.equals("parties")
asserts("action name") { controller.action_name }.equals("update")

Expand Down

0 comments on commit 7c0c8e4

Please sign in to comment.