Fix routing test to use assert_equal

rails · Jan 6, 2012 · 93df3b2 · 93df3b2
1 parent 8f309e3
commit 93df3b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/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
 

diff --git a/actionpack/test/dispatch/routing_test.rb b/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