1 files changed, 20 insertions, 10 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 70e03d24ea..2d4083252e 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -56,7 +56,7 @@ class UrlOptionsController < ActionController::Base
   end
 
   def url_options
-    super.merge(:host => 'www.override.com', :action => 'new', :locale => 'en')
+    super.merge(:host => 'www.override.com')
   end
 end
 
@@ -130,8 +130,6 @@ class PerformActionTest < ActionController::TestCase
     @request     = ActionController::TestRequest.new
     @response    = ActionController::TestResponse.new
     @request.host = "www.nextangle.com"
-
-    rescue_action_in_public!
   end
 
   def test_process_should_be_precise
@@ -155,7 +153,22 @@ class UrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    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
@@ -167,9 +180,9 @@ class UrlOptionsTest < ActionController::TestCase
 
       get :from_view, :route => "from_view_url"
 
-      assert_equal 'http://www.override.com/from_view?locale=en', @response.body
-      assert_equal 'http://www.override.com/from_view?locale=en', @controller.send(:from_view_url)
-      assert_equal 'http://www.override.com/default_url_options/new?locale=en', @controller.url_for(:controller => 'default_url_options')
+      assert_equal 'http://www.override.com/from_view', @response.body
+      assert_equal 'http://www.override.com/from_view', @controller.send(:from_view_url)
+      assert_equal 'http://www.override.com/default_url_options/index', @controller.url_for(:controller => 'default_url_options')
     end
   end
 
@@ -179,7 +192,6 @@ class UrlOptionsTest < ActionController::TestCase
         match "account/overview"
       end
 
-      @controller.class.send(:include, set.url_helpers)
       assert !@controller.class.action_methods.include?("account_overview_path")
     end
   end
@@ -191,7 +203,6 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_default_url_options_override
@@ -242,7 +253,6 @@ class EmptyUrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set