diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-18 10:48:18 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-18 10:48:18 -0700 |
| commit | dc59a08fe74d7a6e6b789bcc775087eb94e05311 (patch) | |
| tree | 3e30811477b1a74445772bf03b846b70f85d389b /actionpack/test/controller | |
| parent | 843b8c0b8c8cccd8d1432060dfc79a8edcc4ed2c (diff) | |
| parent | 86433b8d5f1a7d28e0bb6ceeaf824e67acf4b759 (diff) | |
| download | rails-dc59a08fe74d7a6e6b789bcc775087eb94e05311.tar.gz rails-dc59a08fe74d7a6e6b789bcc775087eb94e05311.tar.bz2 rails-dc59a08fe74d7a6e6b789bcc775087eb94e05311.zip | |
Merge pull request #16221 from arthurnn/14886_pr
Cleanup + CHANGELOG for pr #14886
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/show_exceptions_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb index ff23b22040..f7eba1ef43 100644 --- a/actionpack/test/controller/show_exceptions_test.rb +++ b/actionpack/test/controller/show_exceptions_test.rb @@ -32,7 +32,7 @@ module ShowExceptions test 'show diagnostics from a local ip if show_detailed_exceptions? is set to request.local?' do @app = ShowExceptionsController.action(:boom) - ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address| + ['127.0.0.1', '127.0.0.127', '127.12.1.1', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address| self.remote_addr = ip_address get '/' assert_match(/boom/, body) |