Fix generating params with optional defaults [#3404 state:resolved]

actionpack/lib/action_dispatch/routing/deprecated_mapper.rb

@@ -175,7 +175,7 @@ module ActionDispatch
               optional = false
             elsif segment =~ /^:(\w+)$/
               if defaults.has_key?($1.to_sym)
-                defaults.delete($1.to_sym)
+                defaults.delete($1.to_sym) if defaults[$1.to_sym].nil?
               else
                 optional = false
               end

actionpack/test/controller/routing_test.rb

@@ -1639,10 +1639,8 @@ class RouteSetTest < ActiveSupport::TestCase
       map.connect ':controller/:action/:id'
     end
 
-    pending do
     assert_equal '/ibocorp', set.generate({:controller => 'ibocorp', :page => 1})
   end
-  end
 
   def test_generate_with_optional_params_recalls_last_request
     set.draw do |map|