Added unit test to cover changes to RouteSet.url_for

ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
ActionDispatch::Http::Url.url_for

Conflicts:

	actionpack/test/controller/base_test.rb

actionpack/test/controller/base_test.rb

@@ -158,6 +158,22 @@ class UrlOptionsTest < ActionController::TestCase
     rescue_action_in_public!
   end
 
+  def test_url_for_query_params_included
+    rs = ActionDispatch::Routing::RouteSet.new
+    rs.draw do
+      match 'home' => 'pages#home'
+    end
+
+    options = {
+      :action     => "home",
+      :controller => "pages",
+      :only_path  => true,
+      :params     => { "token" => "secret" }
+    }
+
+    assert_equal '/home?token=secret', rs.url_for(options)
+  end
+
   def test_url_options_override
     with_routing do |set|
       set.draw do