diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-16 09:16:03 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-16 09:16:03 -0800 |
| commit | f84478f46e4791bcc19a826e1e813fd1bfb65498 (patch) | |
| tree | e4d1ca4c41c7d7ba0c7bff71bef746ee89b08a4d /actionpack | |
| parent | 56d980b7f7aff8765caeedb8ad3d01137c569d6c (diff) | |
| parent | 3141da0e3eb4198ae8bcf7fccf403583bd695bf1 (diff) | |
| download | rails-f84478f46e4791bcc19a826e1e813fd1bfb65498.tar.gz rails-f84478f46e4791bcc19a826e1e813fd1bfb65498.tar.bz2 rails-f84478f46e4791bcc19a826e1e813fd1bfb65498.zip | |
Merge pull request #4462 from spohlenz/fix-routing-tests
Stub ip method of alternative request class in router tests
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index e5ed11d1ea..c6e6ed4d6b 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -524,6 +524,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest "GET" end + def ip + "127.0.0.1" + end + def x_header @env["HTTP_X_HEADER"] || "" end |