Merge pull request rails#4342 from carlosantoniodasilva/fix-routing-test

Fix routing test and remove deprecated method

Author: josevalim

actionpack/lib/action_dispatch/middleware/remote_ip.rb

@@ -33,8 +33,8 @@ def call(env)
 
     class GetIp
       def initialize(env, middleware)
-        @env          = env
-        @middleware   = middleware
+        @env           = env
+        @middleware    = middleware
         @calculated_ip = false
       end
 

actionpack/test/controller/action_pack_assertions_test.rb

@@ -338,7 +338,7 @@ def test_response_object
   end
 
   def test_render_based_on_parameters
-    process :render_based_on_parameters, "name" => "David"
+    process :render_based_on_parameters, "GET", "name" => "David"
     assert_equal "Mr. David", @response.body
   end
 

actionpack/test/dispatch/routing_test.rb

@@ -1443,10 +1443,10 @@ def test_nested_optional_scoped_path
   def test_nested_optional_path_shorthand
     with_test_routes do
       get '/registrations/new'
-      assert @request.params[:locale].nil?
+      assert_nil @request.params[:locale]
 
       get '/en/registrations/new'
-      assert 'en', @request.params[:locale]
+      assert_equal 'en', @request.params[:locale]
     end
   end