Merge branch 'master' of git://github.com/rails/rails

5 files changed, 163 insertions, 22 deletions

diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index b070f925d4..fee9cf46f9 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -501,6 +501,12 @@ class RespondWithController < ActionController::Base
     respond_with(Customer.new("david", 13), :responder => responder)
   end
 
+  def using_resource_with_action
+    respond_with(Customer.new("david", 13), :action => :foo) do |format|
+      format.html { raise ActionView::MissingTemplate.new([], "method") }
+    end
+  end
+
 protected
 
   def _render_js(js, options)
@@ -715,6 +721,20 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_match /<name>jamis<\/name>/, @response.body
   end
 
+  def test_using_resource_with_action
+    @controller.instance_eval do
+      def render(params={})
+        self.response_body = "#{params[:action]} - #{formats}"
+      end
+    end
+
+    errors = { :name => :invalid }
+    Customer.any_instance.stubs(:errors).returns(errors)
+
+    post :using_resource_with_action
+    assert_equal "foo - #{[:html].to_s}", @controller.response_body
+  end
+
   def test_clear_respond_to
     @controller = InheritedRespondWithController.new
     @request.accept = "text/html"
@@ -760,7 +780,7 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal "Resource name is david", @response.body
   end
 
-  def test_using_resource_with_responder
+  def test_using_resource_with_set_responder
     RespondWithController.responder = proc { |c, r, o| c.render :text => "Resource name is #{r.first.name}" }
     get :using_resource
     assert_equal "Resource name is david", @response.body
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 7111796f8d..09003adf73 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -18,7 +18,7 @@ module RequestForgeryProtectionActions
   def unsafe
     render :text => 'pwn'
   end
-  
+
   def rescue_action(e) raise e end
 end
 
@@ -40,6 +40,13 @@ class FreeCookieController < RequestForgeryProtectionController
   end
 end
 
+class CustomAuthenticityParamController < RequestForgeryProtectionController
+  def form_authenticity_param
+    'foobar'
+  end
+end
+
+
 # common test methods
 
 module RequestForgeryProtectionTests
@@ -241,3 +248,14 @@ class FreeCookieControllerTest < ActionController::TestCase
     end
   end
 end
+
+class CustomAuthenticityParamControllerTest < ActionController::TestCase
+  def setup
+    ActionController::Base.request_forgery_protection_token = :authenticity_token
+  end
+
+  def test_should_allow_custom_token
+    post :index, :authenticity_token => 'foobar'
+    assert_response :ok
+  end
+end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 3971aacadb..4eaf309c41 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1418,6 +1418,7 @@ class RouteSetTest < ActiveSupport::TestCase
         :action => 'show',
         :requirements => {:name => /(david|jamis)/i}
     end
+
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
     assert_equal "/page/david", url
     assert_raise ActionController::RoutingError do
@@ -1459,13 +1460,16 @@ class RouteSetTest < ActiveSupport::TestCase
                                       jamis #The Deployer
                                     )/x}
     end
-    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-    assert_equal "/page/david", url
-    assert_raise ActionController::RoutingError do
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-    end
-    assert_raise ActionController::RoutingError do
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+
+    pending do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+      assert_equal "/page/david", url
+      assert_raise ActionController::RoutingError do
+        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+      end
+      assert_raise ActionController::RoutingError do
+        url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+      end
     end
   end
 
@@ -1480,8 +1484,11 @@ class RouteSetTest < ActiveSupport::TestCase
                                       jamis #The Deployer
                                     )/xi}
     end
-    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-    assert_equal "/page/JAMIS", url
+
+    pending do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+      assert_equal "/page/JAMIS", url
+    end
   end
 
   def test_route_requirement_recognize_with_xi_modifiers
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index ca07bc7a28..496445fc34 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -212,9 +212,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/involvements'
       assert_equal 'involvements#index', @response.body
+      assert_equal '/projects/1/involvements', project_involvements_path(:project_id => '1')
 
       get '/projects/1/involvements/1'
       assert_equal 'involvements#show', @response.body
+      assert_equal '/projects/1/involvements/1', project_involvement_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -222,6 +224,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/attachments'
       assert_equal 'attachments#index', @response.body
+      assert_equal '/projects/1/attachments', project_attachments_path(:project_id => '1')
     end
   end
 
@@ -229,9 +232,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/participants'
       assert_equal 'participants#index', @response.body
+      assert_equal '/projects/1/participants', project_participants_path(:project_id => '1')
 
       put '/projects/1/participants/update_all'
       assert_equal 'participants#update_all', @response.body
+
+      pending do
+        assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
+      end
     end
   end
 
@@ -239,12 +247,19 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/companies'
       assert_equal 'companies#index', @response.body
+      assert_equal '/projects/1/companies', project_companies_path(:project_id => '1')
 
       get '/projects/1/companies/1/people'
       assert_equal 'people#index', @response.body
+      pending do
+        assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
+      end
 
       get '/projects/1/companies/1/avatar'
       assert_equal 'avatars#show', @response.body
+      pending do
+        assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
+      end
     end
   end
 
@@ -252,9 +267,13 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/images'
       assert_equal 'images#index', @response.body
+      assert_equal '/projects/1/images', project_images_path(:project_id => '1')
 
       post '/projects/1/images/1/revise'
       assert_equal 'images#revise', @response.body
+      pending do
+        assert_equal '/projects/1/images/1/revise', revise_project_image_path(:project_id => '1', :id => '1')
+      end
     end
   end
 
@@ -262,21 +281,35 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/people'
       assert_equal 'people#index', @response.body
+      assert_equal '/projects/1/people', project_people_path(:project_id => '1')
 
       get '/projects/1/people/1'
       assert_equal 'people#show', @response.body
+      assert_equal '/projects/1/people/1', project_person_path(:project_id => '1', :id => '1')
 
       get '/projects/1/people/1/7a2dec8/avatar'
       assert_equal 'avatars#show', @response.body
+      pending do
+        assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
+      end
 
       put '/projects/1/people/1/accessible_projects'
       assert_equal 'people#accessible_projects', @response.body
+      pending do
+        assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
+      end
 
       post '/projects/1/people/1/resend'
       assert_equal 'people#resend', @response.body
+      pending do
+        assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
+      end
 
       post '/projects/1/people/1/generate_new_password'
       assert_equal 'people#generate_new_password', @response.body
+      pending do
+        assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
+      end
     end
   end
 
@@ -284,24 +317,43 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/posts'
       assert_equal 'posts#index', @response.body
+      assert_equal '/projects/1/posts', project_posts_path(:project_id => '1')
 
       get '/projects/1/posts/archive'
       assert_equal 'posts#archive', @response.body
+      pending do
+        assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
+      end
 
       get '/projects/1/posts/toggle_view'
       assert_equal 'posts#toggle_view', @response.body
+      pending do
+        assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
+      end
 
       post '/projects/1/posts/1/preview'
       assert_equal 'posts#preview', @response.body
+      pending do
+        assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
+      end
 
       get '/projects/1/posts/1/subscription'
       assert_equal 'subscriptions#show', @response.body
+      pending do
+        assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
+      end
 
       get '/projects/1/posts/1/comments'
       assert_equal 'comments#index', @response.body
+      pending do
+        assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
+      end
 
       post '/projects/1/posts/1/comments/preview'
       assert_equal 'comments#preview', @response.body
+      pending do
+        assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
+      end
     end
   end
 
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 04c635e770..44734abb18 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -613,6 +613,26 @@ class FormHelperTest < ActionView::TestCase
 
     expected = '<form action="http://www.example.com" method="post">' +
                '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+               '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+  
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_one_to_one_association_with_explicit_hidden_field_placement
+    @post.author = Author.new(321)
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:author) do |af|
+        concat af.hidden_field(:id)
+        concat af.text_field(:name)
+      end
+    end
+    
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
                '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
                '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
                '</form>'
@@ -634,6 +654,30 @@ class FormHelperTest < ActionView::TestCase
 
     expected = '<form action="http://www.example.com" method="post">' +
                '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_with_explicit_hidden_field_placement
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.hidden_field(:id)
+          concat cf.text_field(:name)
+        end
+      end
+    end
+    
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
                '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
                '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
                '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
@@ -678,8 +722,8 @@ class FormHelperTest < ActionView::TestCase
 
     expected = '<form action="http://www.example.com" method="post">' +
                '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
                '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
                '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
                '</form>'
 
@@ -713,10 +757,10 @@ class FormHelperTest < ActionView::TestCase
 
     expected = '<form action="http://www.example.com" method="post">' +
                '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
                '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
                '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
                '</form>'
 
     assert_dom_equal expected, output_buffer
@@ -736,8 +780,8 @@ class FormHelperTest < ActionView::TestCase
 
     expected = '<form action="http://www.example.com" method="post">' +
                '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
                '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
                '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
                '</form>'
 
@@ -755,8 +799,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
-               '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />' +
                '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />' +
                '</form>'
 
     assert_dom_equal expected, output_buffer
@@ -790,18 +834,18 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
                '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
-               '<input id="post_comments_attributes_0_relevances_attributes_0_id" name="post[comments_attributes][0][relevances_attributes][0][id]" type="hidden" value="314" />' +
                '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="commentrelevance #314" />' +
-               '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
+               '<input id="post_comments_attributes_0_relevances_attributes_0_id" name="post[comments_attributes][0][relevances_attributes][0][id]" type="hidden" value="314" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
                '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" size="30" type="text" value="tag #123" />' +
-               '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
                '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #3141" />' +
-               '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />' +
+               '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
+               '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
                '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" size="30" type="text" value="tag #456" />' +
-               '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
                '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #31415" />' +
+               '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
+               '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />' +
                '</form>'
 
     assert_dom_equal expected, output_buffer