Switch to kwargs in ActionController::TestCase and ActionDispatch::Integration

Non-kwargs requests are deprecated now. Guides are updated as well. `post url, nil, nil, { a: 'b' }` doesn't make sense. `post url, params: { y: x }, session: { a: 'b' }` would be an explicit way to do the same
author: Kir Shatrov <shatrov@me.com> 2015-01-04 10:35:06 +0100
committer: Kir Shatrov <shatrov@me.com> 2015-01-29 14:44:46 +0200
commit: baf14ae513337cb185acf865e93dfc48f3aabf6a (patch)
tree: 77235d82964272c8721a62ae046b16279d01f945 /actionpack/test/controller/test_case_test.rb
parent: 069b72aaf04d2caef76f8e71f320716129f2d949 (diff)
download: rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.tar.gz
rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.tar.bz2
rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.zip
1 files changed, 279 insertions, 87 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 2e1f21c645..72faf655fe 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -6,57 +6,57 @@ require 'rails/engine'
 class TestCaseTest < ActionController::TestCase
   class TestController < ActionController::Base
     def no_op
-      render :text => 'dummy'
+      render text: 'dummy'
     end
 
     def set_flash
       flash["test"] = ">#{flash["test"]}<"
-      render :text => 'ignore me'
+      render text: 'ignore me'
     end
 
     def set_flash_now
       flash.now["test_now"] = ">#{flash["test_now"]}<"
-      render :text => 'ignore me'
+      render text: 'ignore me'
     end
 
     def set_session
       session['string'] = 'A wonder'
       session[:symbol] = 'it works'
-      render :text => 'Success'
+      render text: 'Success'
     end
 
     def reset_the_session
       reset_session
-      render :text => 'ignore me'
+      render text: 'ignore me'
     end
 
     def render_raw_post
       raise ActiveSupport::TestCase::Assertion, "#raw_post is blank" if request.raw_post.blank?
-      render :text => request.raw_post
+      render text: request.raw_post
     end
 
     def render_body
-      render :text => request.body.read
+      render text: request.body.read
     end
 
     def test_params
-      render :text => params.inspect
+      render text: params.inspect
     end
 
     def test_uri
-      render :text => request.fullpath
+      render text: request.fullpath
     end
 
     def test_format
-      render :text => request.format
+      render text: request.format
     end
 
     def test_query_string
-      render :text => request.query_string
+      render text: request.query_string
     end
 
     def test_protocol
-      render :text => request.protocol
+      render text: request.protocol
     end
 
     def test_headers
@@ -64,7 +64,7 @@ class TestCaseTest < ActionController::TestCase
     end
 
     def test_html_output
-      render :text => <<HTML
+      render text: <<HTML
 <html>
   <body>
     <a href="/"><img src="/images/button.png" /></a>
@@ -86,7 +86,7 @@ HTML
 
     def test_xml_output
       response.content_type = "application/xml"
-      render :text => <<XML
+      render text: <<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
   <area>area is an empty tag in HTML, raising an error if not in xml mode</area>
@@ -95,15 +95,15 @@ XML
     end
 
     def test_only_one_param
-      render :text => (params[:left] && params[:right]) ? "EEP, Both here!" : "OK"
+      render text: (params[:left] && params[:right]) ? "EEP, Both here!" : "OK"
     end
 
     def test_remote_addr
-      render :text => (request.remote_addr || "not specified")
+      render text: (request.remote_addr || "not specified")
     end
 
     def test_file_upload
-      render :text => params[:file].size
+      render text: params[:file].size
     end
 
     def test_send_file
@@ -111,26 +111,26 @@ XML
     end
 
     def redirect_to_same_controller
-      redirect_to :controller => 'test', :action => 'test_uri', :id => 5
+      redirect_to controller: 'test', action: 'test_uri', id: 5
     end
 
     def redirect_to_different_controller
-      redirect_to :controller => 'fail', :id => 5
+      redirect_to controller: 'fail', id: 5
     end
 
     def create
-      head :created, :location => 'created resource'
+      head :created, location: 'created resource'
     end
 
     def delete_cookie
       cookies.delete("foo")
-      render :nothing => true
+      render nothing: true
     end
 
     def test_assigns
       @foo = "foo"
-      @foo_hash = {:foo => :bar}
-      render :nothing => true
+      @foo_hash = {foo: :bar}
+      render nothing: true
     end
 
     def test_without_body
@@ -144,7 +144,7 @@ XML
     private
 
       def generate_url(opts)
-        url_for(opts.merge(:action => "test_uri"))
+        url_for(opts.merge(action: "test_uri"))
       end
   end
 
@@ -164,7 +164,7 @@ XML
   class ViewAssignsController < ActionController::Base
     def test_assigns
       @foo = "foo"
-      render :nothing => true
+      render nothing: true
     end
 
     def view_assigns
@@ -209,32 +209,50 @@ XML
   end
 
   def test_raw_post_handling
-    params = Hash[:page, {:name => 'page name'}, 'some key', 123]
-    post :render_raw_post, params.dup
+    params = Hash[:page, {name: 'page name'}, 'some key', 123]
+    post :render_raw_post, params: params.dup
 
     assert_equal params.to_query, @response.body
   end
 
   def test_body_stream
-    params = Hash[:page, { :name => 'page name' }, 'some key', 123]
+    params = Hash[:page, { name: 'page name' }, 'some key', 123]
 
-    post :render_body, params.dup
+    post :render_body, params: params.dup
+
+    assert_equal params.to_query, @response.body
+  end
+
+  def test_deprecated_body_stream
+    params = Hash[:page, { name: 'page name' }, 'some key', 123]
+
+    assert_deprecated { post :render_body, params.dup }
 
     assert_equal params.to_query, @response.body
   end
 
   def test_document_body_and_params_with_post
-    post :test_params, :id => 1
-    assert_equal("{\"id\"=>\"1\", \"controller\"=>\"test_case_test/test\", \"action\"=>\"test_params\"}", @response.body)
+    post :test_params, params: { id: 1 }
+    assert_equal(%({"id"=>"1", "controller"=>"test_case_test/test", "action"=>"test_params"}), @response.body)
   end
 
   def test_document_body_with_post
-    post :render_body, "document body"
+    post :render_body, body: "document body"
+    assert_equal "document body", @response.body
+  end
+
+  def test_deprecated_document_body_with_post
+    assert_deprecated { post :render_body, "document body" }
     assert_equal "document body", @response.body
   end
 
   def test_document_body_with_put
-    put :render_body, "document body"
+    put :render_body, body: "document body"
+    assert_equal "document body", @response.body
+  end
+
+  def test_deprecated_document_body_with_put
+    assert_deprecated { put :render_body, "document body" }
     assert_equal "document body", @response.body
   end
 
@@ -243,22 +261,32 @@ XML
     assert_equal 200, @response.status
   end
 
-  def test_head_params_as_string
-    assert_raise(NoMethodError) { head :test_params, "document body", :id => 10 }
-  end
-
   def test_process_without_flash
     process :set_flash
     assert_equal '><', flash['test']
   end
 
+  def test_deprecated_process_with_flash
+    assert_deprecated { process :set_flash, "GET", nil, nil, { "test" => "value" } }
+    assert_equal '>value<', flash['test']
+  end
+
   def test_process_with_flash
-    process :set_flash, "GET", nil, nil, { "test" => "value" }
+    process :set_flash,
+      method: "GET",
+      flash: { "test" => "value" }
     assert_equal '>value<', flash['test']
   end
 
+  def test_deprecated_process_with_flash_now
+    assert_deprecated { process :set_flash_now, "GET", nil, nil, { "test_now" => "value_now" } }
+    assert_equal '>value_now<', flash['test_now']
+  end
+
   def test_process_with_flash_now
-    process :set_flash_now, "GET", nil, nil, { "test_now" => "value_now" }
+    process :set_flash_now,
+      method: "GET",
+      flash: { "test_now" => "value_now" }
     assert_equal '>value_now<', flash['test_now']
   end
 
@@ -271,22 +299,48 @@ XML
   end
 
   def test_process_with_session_arg
-    process :no_op, "GET", nil, { 'string' => 'value1', :symbol => 'value2' }
+    assert_deprecated { process :no_op, "GET", nil, { 'string' => 'value1', symbol: 'value2' } }
+    assert_equal 'value1', session['string']
+    assert_equal 'value1', session[:string]
+    assert_equal 'value2', session['symbol']
+    assert_equal 'value2', session[:symbol]
+  end
+
+  def test_process_with_session_kwarg
+    process :no_op, method: "GET", session: { 'string' => 'value1', symbol: 'value2' }
     assert_equal 'value1', session['string']
     assert_equal 'value1', session[:string]
     assert_equal 'value2', session['symbol']
     assert_equal 'value2', session[:symbol]
   end
 
+  def test_deprecated_process_merges_session_arg
+    session[:foo] = 'bar'
+    assert_deprecated {
+      get :no_op, nil, { bar: 'baz' }
+    }
+    assert_equal 'bar', session[:foo]
+    assert_equal 'baz', session[:bar]
+  end
+
   def test_process_merges_session_arg
     session[:foo] = 'bar'
-    get :no_op, nil, { :bar => 'baz' }
+    get :no_op, session: { bar: 'baz' }
     assert_equal 'bar', session[:foo]
     assert_equal 'baz', session[:bar]
   end
 
+  def test_deprecated_merged_session_arg_is_retained_across_requests
+    assert_deprecated {
+      get :no_op, nil, { foo: 'bar' }
+    }
+    assert_equal 'bar', session[:foo]
+    get :no_op
+    assert_equal 'bar', session[:foo]
+  end
+
   def test_merged_session_arg_is_retained_across_requests
-    get :no_op, nil, { :foo => 'bar' }
+    get :no_op, session: { foo: 'bar' }
     assert_equal 'bar', session[:foo]
     get :no_op
     assert_equal 'bar', session[:foo]
@@ -294,7 +348,7 @@ XML
 
   def test_process_overwrites_existing_session_arg
     session[:foo] = 'bar'
-    get :no_op, nil, { :foo => 'baz' }
+    get :no_op, session: { foo: 'baz' }
     assert_equal 'baz', session[:foo]
   end
 
@@ -321,19 +375,40 @@ XML
     assert_equal "/test_case_test/test/test_uri", @response.body
   end
 
+  def test_process_with_symbol_method
+    process :test_uri, method: :get
+    assert_equal "/test_case_test/test/test_uri", @response.body
+  end
+
+  def test_deprecated_process_with_request_uri_with_params
+    assert_deprecated { process :test_uri, "GET", id: 7}
+    assert_equal "/test_case_test/test/test_uri/7", @response.body
+  end
+
   def test_process_with_request_uri_with_params
-    process :test_uri, "GET", :id => 7
+    process :test_uri,
+      method: "GET",
+      params: { id: 7 }
+
     assert_equal "/test_case_test/test/test_uri/7", @response.body
   end
 
+  def test_deprecated_process_with_request_uri_with_params_with_explicit_uri
+    @request.env['PATH_INFO'] = "/explicit/uri"
+    assert_deprecated { process :test_uri, "GET", id: 7 }
+    assert_equal "/explicit/uri", @response.body
+  end
+
   def test_process_with_request_uri_with_params_with_explicit_uri
     @request.env['PATH_INFO'] = "/explicit/uri"
-    process :test_uri, "GET", :id => 7
+    process :test_uri, method: "GET", params: {id: 7}
     assert_equal "/explicit/uri", @response.body
   end
 
   def test_process_with_query_string
-    process :test_query_string, "GET", :q => 'test'
+    process :test_query_string,
+      method: "GET",
+      params: { q: 'test' }
     assert_equal "q=test", @response.body
   end
 
@@ -345,9 +420,9 @@ XML
   end
 
   def test_multiple_calls
-    process :test_only_one_param, "GET", :left => true
+    process :test_only_one_param, method: "GET", params: { left: true }
     assert_equal "OK", @response.body
-    process :test_only_one_param, "GET", :right => true
+    process :test_only_one_param, method: "GET", params: { right: true }
     assert_equal "OK", @response.body
   end
 
@@ -362,7 +437,7 @@ XML
     assert_equal "foo", assigns["foo"]
 
     # but the assigned variable should not have its own keys stringified
-    expected_hash = { :foo => :bar }
+    expected_hash = { foo: :bar }
     assert_equal expected_hash, assigns(:foo_hash)
   end
 
@@ -390,21 +465,21 @@ XML
   end
 
   def test_assert_generates
-    assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
-    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action"}
-    assert_generates 'controller/action/5', {:controller => "controller", :action => "action", :id => "5", :name => "bob"}, {}, {:name => "bob"}
-    assert_generates 'controller/action/7', {:id => "7", :name => "bob"}, {:controller => "controller", :action => "action"}, {:name => "bob"}
-    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action", :name => "bob"}, {}
+    assert_generates 'controller/action/5', controller: 'controller', action: 'action', id: '5'
+    assert_generates 'controller/action/7', {id: "7"}, {controller: "controller", action: "action"}
+    assert_generates 'controller/action/5', {controller: "controller", action: "action", id: "5", name: "bob"}, {}, {name: "bob"}
+    assert_generates 'controller/action/7', {id: "7", name: "bob"}, {controller: "controller", action: "action"}, {name: "bob"}
+    assert_generates 'controller/action/7', {id: "7"}, {controller: "controller", action: "action", name: "bob"}, {}
   end
 
   def test_assert_routing
-    assert_routing 'content', :controller => 'content', :action => 'index'
+    assert_routing 'content', controller: 'content', action: 'index'
   end
 
   def test_assert_routing_with_method
     with_routing do |set|
       set.draw { resources(:content) }
-      assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
+      assert_routing({ method: 'post', path: 'content' }, { controller: 'content', action: 'create' })
     end
   end
 
@@ -416,29 +491,71 @@ XML
         end
       end
 
-      assert_routing 'admin/user', :controller => 'admin/user', :action => 'index'
+      assert_routing 'admin/user', controller: 'admin/user', action: 'index'
     end
   end
 
   def test_assert_routing_with_glob
     with_routing do |set|
       set.draw { get('*path' => "pages#show") }
-      assert_routing('/company/about', { :controller => 'pages', :action => 'show', :path => 'company/about' })
+      assert_routing('/company/about', { controller: 'pages', action: 'show', path: 'company/about' })
     end
   end
 
+  def test_deprecated_params_passing
+    assert_deprecated {
+      get :test_params, page: {name: "Page name", month: '4', year: '2004', day: '6'}
+    }
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
+      parsed_params
+    )
+  end
+
   def test_params_passing
-    get :test_params, :page => {:name => "Page name", :month => '4', :year => '2004', :day => '6'}
+    get :test_params, params: {
+      page: {
+        name: "Page name",
+        month: '4',
+        year: '2004',
+        day: '6'
+      }
+    }
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
+      parsed_params
+    )
+  end
+
+  def test_kwarg_params_passing_with_session_and_flash
+    get :test_params, params: {
+      page: {
+        name: "Page name",
+        month: '4',
+        year: '2004',
+        day: '6'
+      }
+    }, session: { 'foo' => 'bar' }, flash: { notice: 'created' }
+
     parsed_params = eval(@response.body)
     assert_equal(
       {'controller' => 'test_case_test/test', 'action' => 'test_params',
        'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
       parsed_params
     )
+
+    assert_equal 'bar', session[:foo]
+    assert_equal 'created', flash[:notice]
   end
 
   def test_params_passing_with_fixnums
-    get :test_params, :page => {:name => "Page name", :month => 4, :year => 2004, :day => 6}
+    get :test_params, params: {
+      page: { name: "Page name", month: 4, year: 2004, day: 6 }
+    }
     parsed_params = eval(@response.body)
     assert_equal(
       {'controller' => 'test_case_test/test', 'action' => 'test_params',
@@ -448,7 +565,7 @@ XML
   end
 
   def test_params_passing_with_fixnums_when_not_html_request
-    get :test_params, :format => 'json', :count => 999
+    get :test_params, params: { format: 'json', count: 999 }
     parsed_params = eval(@response.body)
     assert_equal(
       {'controller' => 'test_case_test/test', 'action' => 'test_params',
@@ -458,7 +575,17 @@ XML
   end
 
   def test_params_passing_path_parameter_is_string_when_not_html_request
-    get :test_params, :format => 'json', :id => 1
+    get :test_params, params: { format: 'json', id: 1 }
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'format' => 'json', 'id' => '1' },
+      parsed_params
+    )
+  end
+
+  def test_deprecated_params_passing_path_parameter_is_string_when_not_html_request
+    assert_deprecated { get :test_params, format: 'json', id: 1 }
     parsed_params = eval(@response.body)
     assert_equal(
       {'controller' => 'test_case_test/test', 'action' => 'test_params',
@@ -469,7 +596,9 @@ XML
 
   def test_params_passing_with_frozen_values
     assert_nothing_raised do
-      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze, :deepfreeze => { :frozen => 'icy'.freeze }.freeze
+      get :test_params, params: {
+        frozen: 'icy'.freeze, frozens: ['icy'.freeze].freeze, deepfreeze: { frozen: 'icy'.freeze }.freeze
+      }
     end
     parsed_params = eval(@response.body)
     assert_equal(
@@ -480,8 +609,8 @@ XML
   end
 
   def test_params_passing_doesnt_modify_in_place
-    page = {:name => "Page name", :month => 4, :year => 2004, :day => 6}
-    get :test_params, :page => page
+    page = {name: "Page name", month: 4, year: 2004, day: 6}
+    get :test_params, params: { page: page }
     assert_equal 2004, page[:year]
   end
 
@@ -504,25 +633,32 @@ XML
   end
 
   def test_id_converted_to_string
-    get :test_params, :id => 20, :foo => Object.new
+    get :test_params, params: {
+      id: 20, foo: Object.new
+    }
+    assert_kind_of String, @request.path_parameters[:id]
+  end
+
+  def test_deprecared_id_converted_to_string
+    assert_deprecated { get :test_params, id: 20, foo: Object.new}
     assert_kind_of String, @request.path_parameters[:id]
   end
 
   def test_array_path_parameter_handled_properly
     with_routing do |set|
       set.draw do
-        get 'file/*path', :to => 'test_case_test/test#test_params'
+        get 'file/*path', to: 'test_case_test/test#test_params'
         get ':controller/:action'
       end
 
-      get :test_params, :path => ['hello', 'world']
+      get :test_params, params: { path: ['hello', 'world'] }
       assert_equal ['hello', 'world'], @request.path_parameters[:path]
       assert_equal 'hello/world', @request.path_parameters[:path].to_param
     end
   end
 
   def test_assert_realistic_path_parameters
-    get :test_params, :id => 20, :foo => Object.new
+    get :test_params, params: { id: 20, foo: Object.new }
 
     # All elements of path_parameters should use Symbol keys
     @request.path_parameters.each_key do |key|
@@ -559,14 +695,37 @@ XML
     assert_nil @request.env['HTTP_ACCEPT']
   end
 
+  def test_xhr_with_params
+    xhr :get, :test_params, params: { id: 1 }
+
+    assert_equal(%({"id"=>"1", "controller"=>"test_case_test/test", "action"=>"test_params"}), @response.body)
+  end
+
+  def test_xhr_with_session
+    xhr :get, :set_session
+
+    assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
+    assert_equal 'A wonder', session[:string], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session['symbol'], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
+  end
+
   def test_header_properly_reset_after_get_request
     get :test_params
     @request.recycle!
     assert_nil @request.instance_variable_get("@request_method")
   end
 
+  def test_deprecated_params_reset_between_post_requests
+    assert_deprecated { post :no_op, foo: "bar" }
+    assert_equal "bar", @request.params[:foo]
+
+    post :no_op
+    assert @request.params[:foo].blank?
+  end
+
   def test_params_reset_between_post_requests
-    post :no_op, :foo => "bar"
+    post :no_op, params: { foo: "bar" }
     assert_equal "bar", @request.params[:foo]
 
     post :no_op
@@ -574,15 +733,15 @@ XML
   end
 
   def test_filtered_parameters_reset_between_requests
-    get :no_op, :foo => "bar"
+    get :no_op, params: { foo: "bar" }
     assert_equal "bar", @request.filtered_parameters[:foo]
 
-    get :no_op, :foo => "baz"
+    get :no_op, params: { foo: "baz" }
     assert_equal "baz", @request.filtered_parameters[:foo]
   end
 
   def test_path_params_reset_between_request
-    get :test_params, :id => "foo"
+    get :test_params, params: { id: "foo" }
     assert_equal "foo", @request.path_parameters[:id]
 
     get :test_params
@@ -603,19 +762,38 @@ XML
   end
 
   def test_request_format
-    get :test_format, :format => 'html'
+    get :test_format, params: { format: 'html' }
     assert_equal 'text/html', @response.body
 
-    get :test_format, :format => 'json'
+    get :test_format, params: { format: 'json' }
     assert_equal 'application/json', @response.body
 
-    get :test_format, :format => 'xml'
+    get :test_format, params: { format: 'xml' }
     assert_equal 'application/xml', @response.body
 
     get :test_format
     assert_equal 'text/html', @response.body
   end
 
+  def test_request_format_kwarg
+    get :test_format, format: 'html'
+    assert_equal 'text/html', @response.body
+
+    get :test_format, format: 'json'
+    assert_equal 'application/json', @response.body
+
+    get :test_format, format: 'xml'
+    assert_equal 'application/xml', @response.body
+
+    get :test_format
+    assert_equal 'text/html', @response.body
+  end
+
+  def test_request_format_kwarg_overrides_params
+    get :test_format, format: 'json', params: { format: 'html' }
+    assert_equal 'application/json', @response.body
+  end
+
   def test_should_have_knowledge_of_client_side_cookie_state_even_if_they_are_not_set
     cookies['foo'] = 'bar'
     get :no_op
@@ -700,7 +878,10 @@ XML
   end
 
   def test_fixture_file_upload
-    post :test_file_upload, :file => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
+    post :test_file_upload,
+      params: {
+        file: fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
+      }
     assert_equal '159528', @response.body
   end
 
@@ -716,10 +897,21 @@ XML
     assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
   end
 
+  def test_deprecated_action_dispatch_uploaded_file_upload
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    assert_deprecated {
+      post :test_file_upload, file: ActionDispatch::Http::UploadedFile.new(filename: path, type: "image/jpg", tempfile: File.open(path))
+    }
+    assert_equal '159528', @response.body
+  end
+
   def test_action_dispatch_uploaded_file_upload
     filename = 'mona_lisa.jpg'
     path = "#{FILES_DIR}/#{filename}"
-    post :test_file_upload, :file => ActionDispatch::Http::UploadedFile.new(:filename => path, :type => "image/jpg", :tempfile => File.open(path))
+    post :test_file_upload, params: {
+      file: ActionDispatch::Http::UploadedFile.new(filename: path, type: "image/jpg", tempfile: File.open(path))
+    }
     assert_equal '159528', @response.body
   end
 
@@ -753,7 +945,7 @@ module EngineControllerTests
 
   class BarController < ActionController::Base
     def index
-      render :text => 'bar'
+      render text: 'bar'
     end
   end
 
@@ -830,7 +1022,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
     with_routing do |set|
       set.draw { resources :contents }
       assert_equal 'http://test.host/contents/new', new_content_url
-      assert_equal 'http://test.host/contents/1', content_url(:id => 1)
+      assert_equal 'http://test.host/contents/1', content_url(id: 1)
     end
   end
 end
@@ -839,7 +1031,7 @@ class AnonymousControllerTest < ActionController::TestCase
   def setup
     @controller = Class.new(ActionController::Base) do
       def index
-        render :text => params[:controller]
+        render text: params[:controller]
       end
     end.new
 
@@ -860,29 +1052,29 @@ class RoutingDefaultsTest < ActionController::TestCase
   def setup
     @controller = Class.new(ActionController::Base) do
       def post
-        render :text => request.fullpath
+        render text: request.fullpath
       end
 
       def project
-        render :text => request.fullpath
+        render text: request.fullpath
       end
     end.new
 
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
       r.draw do
-        get '/posts/:id', :to => 'anonymous#post', :bucket_type => 'post'
-        get '/projects/:id', :to => 'anonymous#project', :defaults => { :bucket_type => 'project' }
+        get '/posts/:id', to: 'anonymous#post', bucket_type: 'post'
+        get '/projects/:id', to: 'anonymous#project', defaults: { bucket_type: 'project' }
       end
     end
   end
 
   def test_route_option_can_be_passed_via_process
-    get :post, :id => 1, :bucket_type => 'post'
+    get :post, params: { id: 1, bucket_type: 'post'}
     assert_equal '/posts/1', @response.body
   end
 
   def test_route_default_is_not_required_for_building_request_uri
-    get :project, :id => 2
+    get :project, params: { id: 2 }
     assert_equal '/projects/2', @response.body
   end
 end
author	Kir Shatrov <shatrov@me.com>	2015-01-04 10:35:06 +0100
committer	Kir Shatrov <shatrov@me.com>	2015-01-29 14:44:46 +0200
commit	baf14ae513337cb185acf865e93dfc48f3aabf6a (patch)
tree	77235d82964272c8721a62ae046b16279d01f945 /actionpack/test/controller/test_case_test.rb
parent	069b72aaf04d2caef76f8e71f320716129f2d949 (diff)
download	rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.tar.gz rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.tar.bz2 rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.zip