2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index c28f59dbd6..e4f3a8f125 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -351,7 +351,7 @@ EOM
 
     # Returns the query string, accounting for server idiosyncrasies.
     def query_string
-      @env['QUERY_STRING'].present? ? @env['QUERY_STRING'] : (@env['REQUEST_URI'].split('?', 2)[1] || '')
+      @env['QUERY_STRING'].present? ? @env['QUERY_STRING'] : (@env['REQUEST_URI'].to_s.split('?', 2)[1] || '')
     end
 
     # Returns the request URI, accounting for server idiosyncrasies.
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index bd6c26b69b..5d8cd7e619 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -39,6 +39,10 @@ module ActionDispatch
       @env['PATH_INFO'] = path
     end
 
+    def action=(action_name)
+      path_parameters["action"] = action_name.to_s
+    end
+
     def if_modified_since=(last_modified)
       @env['HTTP_IF_MODIFIED_SINCE'] = last_modified
     end