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:42:07 -0800 |
| commit | f9275e54e0a9462ccbf8d19639232c5cd0fe1348 (patch) | |
| tree | b73c6049e788cbdfe65099ea71f2f74a5e74620c /actionpack | |
| parent | 90aae070ed13f2d82fa4ecfc8d229d4ae0c34d7d (diff) | |
| download | rails-f9275e54e0a9462ccbf8d19639232c5cd0fe1348.tar.gz rails-f9275e54e0a9462ccbf8d19639232c5cd0fe1348.tar.bz2 rails-f9275e54e0a9462ccbf8d19639232c5cd0fe1348.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 67556e5253..4517e9f2b3 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 |