aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/test_test.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-03 00:03:56 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-03 21:24:00 -0800
commiteb49bd694997954783632eada901553f041c9507 (patch)
tree4a126c06b200305b3ddb3fec05e7ad880e8ace09 /actionpack/test/controller/test_test.rb
parentc92d598abff54270337ad1eddf7bc41a71c4cbda (diff)
downloadrails-eb49bd694997954783632eada901553f041c9507.tar.gz
rails-eb49bd694997954783632eada901553f041c9507.tar.bz2
rails-eb49bd694997954783632eada901553f041c9507.zip
Fix tests for the request refactor
Diffstat (limited to 'actionpack/test/controller/test_test.rb')
-rw-r--r--actionpack/test/controller/test_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index d716dc2661..7312c5dfcc 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -128,6 +128,7 @@ XML
@controller = TestController.new
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
+ @request.env['PATH_INFO'] = nil
end
def test_raw_post_handling
@@ -199,7 +200,7 @@ XML
end
def test_process_with_request_uri_with_params_with_explicit_uri
- @request.request_uri = "/explicit/uri"
+ @request.env['PATH_INFO'] = "/explicit/uri"
process :test_uri, :id => 7
assert_equal "/explicit/uri", @response.body
end
@@ -210,7 +211,8 @@ XML
end
def test_process_with_query_string_with_explicit_uri
- @request.request_uri = "/explicit/uri?q=test?extra=question"
+ @request.env['PATH_INFO'] = '/explicit/uri'
+ @request.env['QUERY_STRING'] = 'q=test?extra=question'
process :test_query_string
assert_equal "q=test?extra=question", @response.body
end