actionpack 2.0.5 → 2.1.0

data/test/controller/new_render_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
-require File.dirname(__FILE__) + '/fake_models'
+require 'abstract_unit'
+require 'controller/fake_models'
 
 class CustomersController < ActionController::Base
 end
@@ -17,6 +17,9 @@ module NewRenderTestHelper
   end
 end
 
+class LabellingFormBuilder < ActionView::Helpers::FormBuilder
+end
+
 class NewRenderTestController < ActionController::Base
   layout :determine_layout
 
@@ -75,11 +78,6 @@ class NewRenderTestController < ActionController::Base
     @secret = 'in the sauce'
     render :file => 'test/render_file_with_ivar', :use_full_path => true
   end
- 
-  def render_file_not_using_full_path_with_relative_path
-    @secret = 'in the sauce'
-    render :file => 'test/../test/render_file_with_ivar', :use_full_path => true
-  end
   
   def render_file_not_using_full_path_with_dot_in_path
     @secret = 'in the sauce'
@@ -136,15 +134,50 @@ class NewRenderTestController < ActionController::Base
   def partial_with_locals
     render :partial => "customer", :locals => { :customer => Customer.new("david") } 
   end
-  
+
+  def partial_with_form_builder
+    render :partial => ActionView::Helpers::FormBuilder.new(:post, nil, @template, {}, Proc.new {})
+  end
+
+  def partial_with_form_builder_subclass
+    render :partial => LabellingFormBuilder.new(:post, nil, @template, {}, Proc.new {})
+  end
+
   def partial_collection
     render :partial => "customer", :collection => [ Customer.new("david"), Customer.new("mary") ]
   end
+  
+  def partial_collection_with_spacer
+    render :partial => "customer", :spacer_template => "partial_only", :collection => [ Customer.new("david"), Customer.new("mary") ]
+  end
+  
+  def partial_collection_with_counter
+    render :partial => "customer_counter", :collection => [ Customer.new("david"), Customer.new("mary") ]
+  end
 
   def partial_collection_with_locals
     render :partial => "customer_greeting", :collection => [ Customer.new("david"), Customer.new("mary") ], :locals => { :greeting => "Bonjour" }
   end
 
+  def partial_collection_shorthand_with_locals
+    render :partial => [ Customer.new("david"), Customer.new("mary") ], :locals => { :greeting => "Bonjour" }
+  end
+
+  def partial_collection_shorthand_with_different_types_of_records
+    render :partial => [
+        BadCustomer.new("mark"),
+        GoodCustomer.new("craig"),
+        BadCustomer.new("john"),
+        GoodCustomer.new("zach"),
+        GoodCustomer.new("brandon"),
+        BadCustomer.new("dan") ],
+      :locals => { :greeting => "Bonjour" }
+  end
+
+  def partial_collection_shorthand_with_different_types_of_records_with_counter
+    partial_collection_shorthand_with_different_types_of_records
+  end
+
   def empty_partial_collection
     render :partial => "customer", :collection => []
   end
@@ -206,6 +239,18 @@ class NewRenderTestController < ActionController::Base
     render :inline =>  "Hello: <%= params[:name] %>"
   end
 
+  def accessing_request_in_template
+    render :inline =>  "Hello: <%= request.host %>"
+  end
+
+  def accessing_logger_in_template
+    render :inline =>  "<%= logger.class %>"
+  end
+  
+  def accessing_action_name_in_template
+    render :inline =>  "<%= action_name %>"
+  end
+
   def accessing_params_in_template_with_layout
     render :layout => nil, :inline =>  "Hello: <%= params[:name] %>"
   end
@@ -477,11 +522,6 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
-  def test_render_file_not_using_full_path_with_relative_path
-    get :render_file_not_using_full_path_with_relative_path
-    assert_equal "The secret is in the sauce\n", @response.body
-  end
-
   def test_render_file_not_using_full_path_with_dot_in_path
     get :render_file_not_using_full_path_with_dot_in_path
     assert_equal "The secret is in the sauce\n", @response.body
@@ -501,25 +541,18 @@ class NewRenderTest < Test::Unit::TestCase
   end
 
   def test_access_to_request_in_view
-    view_internals_old_value = ActionController::Base.view_controller_internals
-
-    ActionController::Base.view_controller_internals = false
-    ActionController::Base.protected_variables_cache = nil
-
-    get :hello_world
-    assert !assigns.include?('request'), 'request should not be in assigns'
-
-    ActionController::Base.view_controller_internals = true
-    ActionController::Base.protected_variables_cache = nil
-
-    get :hello_world
-    assert !assigns.include?('request'), 'request should not be in assigns'
-    assert_kind_of ActionController::AbstractRequest, assigns['_request']
-    assert_kind_of ActionController::AbstractRequest, @response.template.request
+    get :accessing_request_in_template
+    assert_equal "Hello: www.nextangle.com", @response.body
+  end
 
-  ensure
-    ActionController::Base.view_controller_internals = view_internals_old_value
-    ActionController::Base.protected_variables_cache = nil
+  def test_access_to_logger_in_view
+    get :accessing_logger_in_template
+    assert_equal "Logger", @response.body
+  end
+  
+  def test_access_to_action_name_in_view
+    get :accessing_action_name_in_template
+    assert_equal "accessing_action_name_in_template", @response.body
   end
 
   def test_render_xml
@@ -544,6 +577,12 @@ EOS
     assert_equal "<p>This is grand!</p>\n", @response.body
   end
 
+  def test_render_with_default_from_accept_header
+    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    get :greeting
+    assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
+  end
+
   def test_render_rjs_with_default
     get :delete_with_js
     assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
@@ -617,7 +656,7 @@ EOS
   end  
 
   def test_bad_render_to_string_still_throws_exception
-    assert_raises(ActionController::MissingTemplate) { get :render_to_string_with_exception }
+    assert_raises(ActionView::MissingTemplate) { get :render_to_string_with_exception }
   end
   
   def test_render_to_string_that_throws_caught_exception_doesnt_break_assigns
@@ -684,15 +723,47 @@ EOS
     assert_equal "Hello: david", @response.body
   end
 
+  def test_partial_with_form_builder
+    get :partial_with_form_builder
+    assert_match(/<label/, @response.body)
+    assert_template('test/_form')
+  end
+
+  def test_partial_with_form_builder_subclass
+    get :partial_with_form_builder_subclass
+    assert_match(/<label/, @response.body)
+    assert_template('test/_labelling_form')
+  end
+
   def test_partial_collection
     get :partial_collection
     assert_equal "Hello: davidHello: mary", @response.body
   end
-
+  
+  def test_partial_collection_with_counter
+    get :partial_collection_with_counter
+    assert_equal "david1mary2", @response.body
+  end
+  
   def test_partial_collection_with_locals
     get :partial_collection_with_locals
     assert_equal "Bonjour: davidBonjour: mary", @response.body
   end
+  
+  def test_partial_collection_with_spacer
+    get :partial_collection_with_spacer
+    assert_equal "Hello: davidonly partialHello: mary", @response.body
+  end
+
+  def test_partial_collection_shorthand_with_locals
+    get :partial_collection_shorthand_with_locals
+    assert_equal "Bonjour: davidBonjour: mary", @response.body
+  end
+
+  def test_partial_collection_shorthand_with_different_types_of_records
+    get :partial_collection_shorthand_with_different_types_of_records
+    assert_equal "Bonjour bad customer: mark1Bonjour good customer: craig2Bonjour bad customer: john3Bonjour good customer: zach4Bonjour good customer: brandon5Bonjour bad customer: dan6", @response.body
+  end
 
   def test_empty_partial_collection
     get :empty_partial_collection
@@ -720,7 +791,7 @@ EOS
   end
   
   def test_render_missing_partial_template
-    assert_raises(ActionView::ActionViewError) do
+    assert_raises(ActionView::MissingTemplate) do
       get :missing_partial
     end
   end

data/test/controller/polymorphic_routes_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class Article
   attr_reader :id
@@ -10,16 +10,16 @@ class Article
   end
 end
 
-class Comment < Article
+class Response < Article
   def post_id; 1 end
 end
 
 class Tag < Article
-  def comment_id; 1 end
+  def response_id; 1 end
 end
 
 # TODO: test nested models
-class Comment::Nested < Comment; end
+class Response::Nested < Response; end
 
 uses_mocha 'polymorphic URL helpers' do
   class PolymorphicRoutesTest < Test::Unit::TestCase
@@ -28,7 +28,7 @@ uses_mocha 'polymorphic URL helpers' do
 
     def setup
       @article = Article.new
-      @comment = Comment.new
+      @response = Response.new
     end
   
     def test_with_record
@@ -65,22 +65,27 @@ uses_mocha 'polymorphic URL helpers' do
       formatted_polymorphic_url([@article, :pdf])
     end
 
-    # TODO: should this work?
-    def xtest_format_option
+    def test_format_option
       @article.save
-      expects(:article_url).with(@article, :format => :pdf)
+      expects(:article_url).with(@article, :pdf)
       polymorphic_url(@article, :format => :pdf)
     end
 
+    def test_id_and_format_option
+      @article.save
+      expects(:article_url).with(:id => @article, :format => :pdf)
+      polymorphic_url(:id => @article, :format => :pdf)
+    end
+
     def test_with_nested
-      @comment.save
-      expects(:article_comment_url).with(@article, @comment)
-      polymorphic_url([@article, @comment])
+      @response.save
+      expects(:article_response_url).with(@article, @response)
+      polymorphic_url([@article, @response])
     end
 
     def test_with_nested_unsaved
-      expects(:article_comments_url).with(@article)
-      polymorphic_url([@article, @comment])
+      expects(:article_responses_url).with(@article)
+      polymorphic_url([@article, @response])
     end
 
     def test_new_with_array_and_namespace
@@ -97,20 +102,20 @@ uses_mocha 'polymorphic URL helpers' do
       @article.save
       expects(:admin_article_url).with(@article)
       polymorphic_url([:admin, @article])
-      expects(:admin_article_comments_url).with(@article)
-      polymorphic_url([:admin, @article, @comment])
+      expects(:admin_article_responses_url).with(@article)
+      polymorphic_url([:admin, @article, @response])
     end
 
     def test_nested_with_array_and_namespace
-      @comment.save
-      expects(:admin_article_comment_url).with(@article, @comment)
-      polymorphic_url([:admin, @article, @comment])
+      @response.save
+      expects(:admin_article_response_url).with(@article, @response)
+      polymorphic_url([:admin, @article, @response])
 
       # a ridiculously long named route tests correct ordering of namespaces and nesting:
       @tag = Tag.new
       @tag.save
-      expects(:site_admin_article_comment_tag_url).with(@article, @comment, @tag)
-      polymorphic_url([:site, :admin, @article, @comment, @tag])
+      expects(:site_admin_article_response_tag_url).with(@article, @response, @tag)
+      polymorphic_url([:site, :admin, @article, @response, @tag])
     end
 
     # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
@@ -125,5 +130,12 @@ uses_mocha 'polymorphic URL helpers' do
       polymorphic_path(@article, :action => :new)
     end
 
+    def test_polymorphic_path_does_not_modify_arguments
+      expects(:admin_article_responses_url).with(@article)
+      path = [:admin, @article, @response]
+      assert_no_difference 'path.size' do
+        polymorphic_url(path)
+      end
+    end
   end
 end

data/test/controller/record_identifier_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class Comment
   attr_reader :id
@@ -57,6 +57,18 @@ class RecordIdentifierTest < Test::Unit::TestCase
     assert_equal expected, partial_path(Comment)
   end
 
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
+
   def test_dom_class
     assert_equal @singular, dom_class(@record)
   end
@@ -100,4 +112,28 @@ class NestedRecordIdentifierTest < RecordIdentifierTest
     assert_equal expected, partial_path(@record)
     assert_equal expected, partial_path(Comment::Nested)
   end
-end
+
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_deeper_namespaced_controller_path
+    expected = "deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "deeper/admin/posts")
+  end
+
+  def test_partial_path_with_even_deeper_namespaced_controller_path
+    expected = "even/more/deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "even/more/deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "even/more/deeper/admin/posts")
+  end
+
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
+end

data/test/controller/redirect_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class WorkshopsController < ActionController::Base
 end
@@ -65,6 +65,14 @@ class RedirectController < ActionController::Base
     redirect_to :action => "hello_world"
   end
 
+  def redirect_to_url
+    redirect_to "http://www.rubyonrails.org/"
+  end
+
+  def redirect_to_url_with_unescaped_query_string
+    redirect_to "http://dev.rubyonrails.org/query?status=new"
+  end
+
   def redirect_to_back
     redirect_to :back
   end
@@ -193,6 +201,18 @@ class RedirectTest < Test::Unit::TestCase
     assert_equal "world", assigns["hello"]
   end
 
+  def test_redirect_to_url
+    get :redirect_to_url
+    assert_response :redirect
+    assert_redirected_to "http://www.rubyonrails.org/"
+  end
+
+  def test_redirect_to_url_with_unescaped_query_string
+    get :redirect_to_url_with_unescaped_query_string
+    assert_response :redirect
+    assert_redirected_to "http://dev.rubyonrails.org/query?status=new"
+  end
+
   def test_redirect_to_back
     @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
     get :redirect_to_back

data/test/controller/render_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
-require File.dirname(__FILE__) + '/fake_models'
+require 'abstract_unit'
+require 'controller/fake_models'
 
 module Fun
   class GamesController < ActionController::Base
@@ -20,6 +20,18 @@ class TestController < ActionController::Base
     render :template => "test/hello_world"
   end
 
+  def render_hello_world_with_forward_slash
+    render :template => "/test/hello_world"
+  end
+  
+  def render_template_in_top_directory
+    render :template => 'shared'
+  end
+  
+  def render_template_in_top_directory_with_slash
+    render :template => '/shared'
+  end
+
   def render_hello_world_from_variable
     @person = "david"
     render :text => "hello #{@person}"
@@ -57,6 +69,12 @@ class TestController < ActionController::Base
     render :text => "hello world", :status => 404
   end
 
+  def render_custom_code_rjs
+    render :update, :status => 404 do |page|
+      page.replace :foo, :partial => 'partial'
+    end
+  end
+
   def render_text_with_nil
     render :text => nil
   end
@@ -82,6 +100,15 @@ class TestController < ActionController::Base
     render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
   end
 
+  def render_line_offset
+    begin
+      render :inline => '<% raise %>', :locals => {:foo => 'bar'}
+    rescue => exc
+    end
+    line = exc.backtrace.first
+    render :text => line
+  end
+
   def heading
     head :ok
   end
@@ -127,14 +154,6 @@ class TestController < ActionController::Base
            :locals => { :local_name => name }
   end
 
-  def accessing_local_assigns_in_inline_template_with_string_keys
-    name = params[:local_name]
-    ActionView::Base.local_assigns_support_string_keys = true
-    render :inline => "<%= 'Goodbye, ' + local_name %>",
-           :locals => { "local_name" => name }
-    ActionView::Base.local_assigns_support_string_keys = false
-  end
-
   def formatted_html_erb
   end
 
@@ -221,6 +240,30 @@ class RenderTest < Test::Unit::TestCase
     assert_template "test/hello_world"
   end
 
+  def test_line_offset
+    get :render_line_offset
+    line = @response.body
+    assert(line =~ %r{:(\d+):})
+    assert_equal "1", $1
+  end
+
+  def test_render_with_forward_slash
+    get :render_hello_world_with_forward_slash
+    assert_template "test/hello_world"
+  end
+  
+  def test_render_in_top_directory
+    get :render_template_in_top_directory
+    assert_template "shared"
+    assert_equal "Elastica", @response.body
+  end
+  
+  def test_render_in_top_directory_with_slash
+    get :render_template_in_top_directory_with_slash
+    assert_template "shared"
+    assert_equal "Elastica", @response.body
+  end
+
   def test_render_from_variable
     get :render_hello_world_from_variable
     assert_equal "hello david", @response.body
@@ -271,6 +314,12 @@ class RenderTest < Test::Unit::TestCase
     assert_equal 'hello world', @response.body
   end
 
+  def test_render_custom_code_rjs
+    get :render_custom_code_rjs
+    assert_response 404
+    assert_equal %(Element.replace("foo", "partial html");), @response.body
+  end
+
   def test_render_text_with_nil
     get :render_text_with_nil
     assert_response 200
@@ -362,11 +411,6 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "Goodbye, Local David", @response.body
   end
 
-  def test_accessing_local_assigns_in_inline_template_with_string_keys
-    get :accessing_local_assigns_in_inline_template_with_string_keys, :local_name => "Local David"
-    assert_equal "Goodbye, Local David", @response.body
-  end
-
   def test_render_200_should_set_etag
     get :render_hello_world_from_variable
     assert_equal etag_for("hello david"), @response.headers['ETag']