Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7992

Show
Ignore:
Timestamp:
10/22/07 21:10:56 (1 year ago)
Author:
bitsweat
Message:

request.parameters doesn't overwrite request.request_parameters. Closes #9949 [nullstyle]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/request.rb

    r7759 r7992  
    276276    # Returns both GET and POST parameters in a single hash. 
    277277    def parameters 
    278       @parameters ||= request_parameters.update(query_parameters).update(path_parameters).with_indifferent_access 
     278      @parameters ||= request_parameters.merge(query_parameters).update(path_parameters).with_indifferent_access 
    279279    end 
    280280 

  • trunk/actionpack/test/controller/request_test.rb

    r7759 r7992  
    355355  def test_user_agent 
    356356    assert_not_nil @request.user_agent 
     357  end 
     358   
     359  def test_parameters 
     360    @request.instance_eval { @request_parameters = { "foo" => 1 } } 
     361    @request.instance_eval { @query_parameters = { "bar" => 2 } } 
     362     
     363    assert_equal({"foo" => 1, "bar" => 2}, @request.parameters) 
     364    assert_equal({"foo" => 1}, @request.request_parameters) 
     365    assert_equal({"bar" => 2}, @request.query_parameters) 
    357366  end 
    358367 

  • trunk/actionpack/test/controller/test_test.rb

    r7793 r7992  
    109109  def test_raw_post_handling 
    110110    params = {:page => {:name => 'page name'}, 'some key' => 123} 
    111     get :render_raw_post, params.dup 
     111    post :render_raw_post, params.dup 
    112112 
    113113    assert_equal params.to_query, @response.body 
    …… 
    117117    params = { :page => { :name => 'page name' }, 'some key' => 123 } 
    118118 
    119     get :render_body, params.dup 
     119    post :render_body, params.dup 
    120120 
    121121    assert_equal params.to_query, @response.body