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

Ticket #8562: add_recognition_for_symbol_parameters_v2.patch

File add_recognition_for_symbol_parameters_v2.patch, 1.3 kB (added by tarmo, 3 years ago)

Simplified patch to fix some test failures

  • actionpack/test/controller/url_rewriter_test.rb

    old new  
    230230    assert_equal params[3], { 'query[person][position][]' => 'art director' }.to_query 
    231231  end 
    232232 
     233  def test_path_generation_for_symbol_parameter_keys 
     234    assert_generates("/image", :controller=> :image) 
     235  end 
     236 
    233237  private 
    234238    def extract_params(url) 
    235239      url.split('?', 2).last.split('&') 
  • actionpack/lib/action_controller/routing.rb

    old new  
    12571257        # great fun, eh? 
    12581258 
    12591259        options_as_params = options.clone 
    1260         options_as_params[:action] ||= 'index' if options[:controller] 
     1260 
     1261        if options[:controller] 
     1262          options_as_params[:controller] = options_as_params[:controller].to_s 
     1263          options_as_params[:action] ||= 'index' 
     1264        end 
    12611265        options_as_params[:action] = options_as_params[:action].to_s if options_as_params[:action] 
    12621266        options_as_params 
    12631267      end