2 files changed, 27 insertions, 6 deletions
diff --git a/railties/test/application/configuration/custom_test.rb b/railties/test/application/configuration/custom_test.rb
index 045537fc28..f8d22f6d97 100644
--- a/railties/test/application/configuration/custom_test.rb
+++ b/railties/test/application/configuration/custom_test.rb
@@ -3,13 +3,20 @@ require 'application/configuration/base_test'
 class ApplicationTests::ConfigurationTests::CustomTest < ApplicationTests::ConfigurationTests::BaseTest
   test 'access custom configuration point' do
     add_to_config <<-RUBY
-      config.x.resque.inline_jobs = :always
-      config.x.resque.timeout     = 60
+      config.x.payment_processing.schedule = :daily
+      config.x.payment_processing.retries  = 3
+      config.x.super_debugger              = true
+      config.x.hyper_debugger              = false
+      config.x.nil_debugger                = nil
     RUBY
     require_environment
 
-    assert_equal :always, Rails.configuration.x.resque.inline_jobs
-    assert_equal 60, Rails.configuration.x.resque.timeout
-    assert_nil Rails.configuration.x.resque.nothing
+    x = Rails.configuration.x
+    assert_equal :daily, x.payment_processing.schedule
+    assert_equal 3, x.payment_processing.retries
+    assert_equal true, x.super_debugger
+    assert_equal false, x.hyper_debugger
+    assert_equal nil, x.nil_debugger
+    assert_nil x.i_do_not_exist.zomg
   end
 end
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index 946b82eeb3..97d5b5c698 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -1,3 +1,4 @@
+require 'ipaddr'
 require 'isolation/abstract_unit'
 require 'active_support/key_generator'
 
@@ -53,12 +54,25 @@ module ApplicationTests
       end
     end
 
+    test "remote_ip works with HTTP_X_FORWARDED_FOR" do
+      make_basic_app
+      assert_equal "4.2.42.42", remote_ip("REMOTE_ADDR" => "1.1.1.1", "HTTP_X_FORWARDED_FOR" => "4.2.42.42")
+    end
+
     test "the user can set trusted proxies" do
       make_basic_app do |app|
         app.config.action_dispatch.trusted_proxies = /^4\.2\.42\.42$/
       end
 
-      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "4.2.42.42,1.1.1.1")
+      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1", "HTTP_X_FORWARDED_FOR" => "4.2.42.42")
+    end
+
+    test "the user can set trusted proxies with an IPAddr argument" do
+      make_basic_app do |app|
+        app.config.action_dispatch.trusted_proxies = IPAddr.new('4.2.42.0/24')
+      end
+
+      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1", "HTTP_X_FORWARDED_FOR" => "10.0.0.0,4.2.42.42")
     end
   end
 end