diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-03-03 00:31:55 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:24:00 -0800 |
| commit | fb14b8c6fddae818b2688ac1e584534390c37f72 (patch) | |
| tree | 442f5876fe272c724ba8b066f91cd37d2a64ca2d /actionpack/test/controller | |
| parent | eb49bd694997954783632eada901553f041c9507 (diff) | |
| download | rails-fb14b8c6fddae818b2688ac1e584534390c37f72.tar.gz rails-fb14b8c6fddae818b2688ac1e584534390c37f72.tar.bz2 rails-fb14b8c6fddae818b2688ac1e584534390c37f72.zip | |
ActionDispatch::Request deprecates #request_uri
* Refactored ActionPatch to use fullpath instead
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/test_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 814699978d..5cb6aa6997 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -333,7 +333,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest with_test_route_set do get '/get_with_params?foo=bar' assert_equal '/get_with_params?foo=bar', request.env["REQUEST_URI"] - assert_equal '/get_with_params?foo=bar', request.request_uri + assert_equal '/get_with_params?foo=bar', request.fullpath assert_equal "foo=bar", request.env["QUERY_STRING"] assert_equal 'foo=bar', request.query_string assert_equal 'bar', request.parameters['foo'] diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index 7312c5dfcc..f6ba275849 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -42,7 +42,7 @@ class TestTest < ActionController::TestCase end def test_uri - render :text => request.request_uri + render :text => request.fullpath end def test_query_string |