actionpack 1.11.2 → 1.12.0

data/test/controller/mime_type_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class MimeTypeTest < Test::Unit::TestCase
+  Mime::PNG   = Mime::Type.new("image/png")
+  Mime::PLAIN = Mime::Type.new("text/plain")
+
+  def test_parse_single
+    Mime::LOOKUP.keys.each do |mime_type|
+      assert_equal [Mime::Type.lookup(mime_type)], Mime::Type.parse(mime_type)
+    end
+  end
+
+  def test_parse_without_q
+    accept = "text/xml,application/xhtml+xml,text/yaml,application/xml,text/html,image/png,text/plain,*/*"
+    expect = [Mime::HTML, Mime::XML, Mime::YAML, Mime::PNG, Mime::PLAIN, Mime::ALL]
+    assert_equal expect, Mime::Type.parse(accept)
+  end
+
+  def test_parse_with_q
+    accept = "text/xml,application/xhtml+xml,text/yaml; q=0.3,application/xml,text/html; q=0.8,image/png,text/plain; q=0.5,*/*; q=0.2"
+    expect = [Mime::HTML, Mime::XML, Mime::PNG, Mime::PLAIN, Mime::YAML, Mime::ALL]
+    assert_equal expect, Mime::Type.parse(accept)
+  end
+end

data/test/controller/new_render_test.rb

@@ -9,6 +9,12 @@ module Fun
   end
 end
 
+module NewRenderTestHelper
+  def rjs_helper_method_from_module
+    page.visual_effect :highlight
+  end
+end
+
 class NewRenderTestController < ActionController::Base
   layout :determine_layout
 
@@ -30,6 +36,10 @@ class NewRenderTestController < ActionController::Base
   def render_action_hello_world
     render :action => "hello_world"
   end
+
+  def render_action_hello_world_as_symbol
+    render :action => :hello_world
+  end
   
   def render_text_hello_world
     render :text => "hello world"
@@ -40,6 +50,10 @@ class NewRenderTestController < ActionController::Base
     render :text => "hello world", :layout => true
   end
 
+  def hello_world_with_layout_false
+    render :layout => false
+  end
+
   def render_custom_code
     render :text => "hello world", :status => "404 Moved"
   end
@@ -59,7 +73,17 @@ 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'
+    render :file => 'test/dot.directory/render_file_with_ivar', :use_full_path => true
+  end
+
   def render_xml_hello
     @name = "David"
     render :template => "test/hello"
@@ -170,6 +194,62 @@ class NewRenderTestController < ActionController::Base
     render :action => "potential_conflicts"
   end
 
+  def hello_world_from_rxml_using_action
+    render :action => "hello_world.rxml"
+  end
+
+  def hello_world_from_rxml_using_template
+    render :template => "test/hello_world.rxml"
+  end
+
+  helper NewRenderTestHelper
+  helper do 
+    def rjs_helper_method(value)
+      page.visual_effect :highlight, value
+    end
+  end
+
+  def enum_rjs_test
+    render :update do |page|
+      page.select('.product').each do |value|
+        page.rjs_helper_method_from_module
+        page.rjs_helper_method(value)
+        page.sortable(value, :url => { :action => "order" })
+        page.draggable(value)
+      end
+    end
+  end
+
+  def delete_with_js
+    @project_id = 4
+  end
+
+  def render_js_with_explicit_template
+    @project_id = 4
+    render :template => 'test/delete_with_js'
+  end
+
+  def render_js_with_explicit_action_template
+    @project_id = 4
+    render :action => 'delete_with_js'
+  end
+
+  def update_page
+    render :update do |page|
+      page.replace_html 'balance', '$37,000,000.00'
+      page.visual_effect :highlight, 'balance'
+    end
+  end
+  
+  def update_page_with_instance_variables
+    @money = '$37,000,000.00'
+    @div_id = 'balance'
+    render :update do |page|
+      page.replace_html @div_id, @money
+      page.visual_effect :highlight, @div_id
+    end
+  end
+
   def action_talk_to_layout
     # Action template sets variable that's picked up by layout
   end
@@ -191,10 +271,15 @@ class NewRenderTestController < ActionController::Base
         when "hello_world", "layout_test", "rendering_without_layout",
              "rendering_nothing_on_layout", "render_text_hello_world",
              "render_text_hello_world_with_layout",
+             "hello_world_with_layout_false",
              "partial_only", "partial_only_with_layout",
              "accessing_params_in_template",
              "accessing_params_in_template_with_layout",
-             "render_with_explicit_template"
+             "render_with_explicit_template",
+             "render_js_with_explicit_template",
+             "render_js_with_explicit_action_template",
+             "delete_with_js", "update_page", "update_page_with_instance_variables"
+    
           "layouts/standard"
         when "builder_layout_test"
           "layouts/builder"
@@ -243,6 +328,11 @@ class NewRenderTest < Test::Unit::TestCase
     assert_template "test/hello_world"
   end
 
+  def test_do_with_render_action_as_symbol
+    get :render_action_hello_world_as_symbol
+    assert_template "test/hello_world"
+  end
+
   def test_do_with_render_text
     get :render_text_hello_world
     assert_equal "hello world", @response.body
@@ -253,6 +343,11 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal "<html>hello world, I'm here!</html>", @response.body
   end
 
+  def test_do_with_render_action_and_layout_false
+    get :hello_world_with_layout_false
+    assert_equal 'Hello world!', @response.body
+  end
+
   def test_do_with_render_custom_code
     get :render_custom_code
     assert_response :missing
@@ -268,6 +363,16 @@ 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
+  end
+
   def test_render_file_with_locals
     get :render_file_with_locals
     assert_equal "The secret is in the sauce\n", @response.body
@@ -305,11 +410,38 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
   end
 
+  def test_enum_rjs_test
+    get :enum_rjs_test
+    assert_equal <<-EOS.strip, @response.body
+$$(".product").each(function(value, index) {
+new Effect.Highlight(element,{});
+new Effect.Highlight(value,{});
+Sortable.create(value, {onUpdate:function(){new Ajax.Request('/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value)})}});
+new Draggable(value, {});
+});
+EOS
+  end
+
   def test_render_xml_with_default
     get :greeting
     assert_equal "<p>This is grand!</p>\n", @response.body
   end
 
+  def test_render_rjs_with_default
+    get :delete_with_js
+    assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+  end
+
+  def test_render_rjs_template_explicitly
+    get :render_js_with_explicit_template
+    assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+  end
+
+  def test_rendering_rjs_action_explicitly
+    get :render_js_with_explicit_action_template
+    assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+  end
+
   def test_layout_rendering
     get :layout_test
     assert_equal "<html>Hello world!</html>", @response.body
@@ -437,8 +569,32 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal "world", assigns["hello"]
   end
   
+  def test_update_page
+    get :update_page
+    assert_template nil
+    assert_equal 'text/javascript; charset=UTF-8', @response.headers['Content-Type']
+    assert_equal 2, @response.body.split($/).length
+  end
+  
+  def test_update_page_with_instance_variables
+    get :update_page_with_instance_variables
+    assert_template nil
+    assert_equal 'text/javascript; charset=UTF-8', @response.headers['Content-Type']
+    assert_match /balance/, @response.body
+    assert_match /\$37/, @response.body
+  end
+  
   def test_yield_content_for
     get :yield_content_for
     assert_equal "<title>Putting stuff in the title!</title>\n\nGreat stuff!\n", @response.body
   end
+
+
+  def test_overwritting_rendering_relative_file_with_extension
+    get :hello_world_from_rxml_using_template
+    assert_equal "<html>\n  <p>Hello</p>\n</html>\n", @response.body
+
+    get :hello_world_from_rxml_using_action
+    assert_equal "<html>\n  <p>Hello</p>\n</html>\n", @response.body
+  end
 end

data/test/controller/redirect_test.rb

@@ -27,6 +27,8 @@ class RedirectController < ActionController::Base
   end
 
   def rescue_errors(e) raise e end
+    
+  def rescue_action(e) raise end
   
   protected
     def dashbord_url(id, message)
@@ -56,6 +58,20 @@ class RedirectTest < Test::Unit::TestCase
     assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
   end
 
+  def test_redirect_error_with_pretty_diff
+    get :host_redirect
+    begin
+      assert_redirected_to :action => "other_host", :only_path => true
+    rescue Test::Unit::AssertionFailedError => err
+      redirection_msg, diff_msg = err.message.scan(/<\{[^\}]+\}>/).collect { |s| s[2..-3] }
+      assert_match %r(:only_path=>false),        redirection_msg
+      assert_match %r(:host=>"other.test.host"), redirection_msg
+      assert_match %r(:action=>"other_host"),    redirection_msg
+      assert_match %r(:only_path=>true),         diff_msg
+      assert_match %r(:host=>"other.test.host"), diff_msg
+    end
+  end
+
   def test_module_redirect
     get :module_redirect
     assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
@@ -76,6 +92,13 @@ class RedirectTest < Test::Unit::TestCase
     get :redirect_to_back
     assert_redirect_url "http://www.example.com/coming/from"
   end
+  
+  def test_redirect_to_back_with_no_referer
+    assert_raises(ActionController::RedirectBackError) {
+      @request.env["HTTP_REFERER"] = nil
+      get :redirect_to_back
+    }
+  end
 end
 
 module ModuleTest

data/test/controller/render_test.rb

@@ -30,7 +30,11 @@ class TestController < ActionController::Base
   def render_action_hello_world
     render_action "hello_world"
   end
-  
+
+  def render_action_hello_world_with_symbol
+    render_action :hello_world
+  end
+ 
   def render_text_hello_world
     render_text "hello world"
   end
@@ -111,50 +115,53 @@ class RenderTest < Test::Unit::TestCase
   def setup
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @controller = TestController.new
 
     @request.host = "www.nextangle.com"
   end
 
   def test_simple_show
-    @request.action = "hello_world"
-    response = process_request
-    assert_equal "200 OK", response.headers["Status"]
-    assert_equal "test/hello_world", response.template.first_render
+    get :hello_world
+    assert_response 200
+    assert_template "test/hello_world"
   end
 
   def test_do_with_render
-    @request.action = "render_hello_world"
-    assert_equal "test/hello_world", process_request.template.first_render
+    get :render_hello_world
+    assert_template "test/hello_world"
   end
 
   def test_do_with_render_from_variable
-    @request.action = "render_hello_world_from_variable"
-    assert_equal "hello david", process_request.body
+    get :render_hello_world_from_variable
+    assert_equal "hello david", @response.body
   end
 
   def test_do_with_render_action
-    @request.action = "render_action_hello_world"
-    assert_equal "test/hello_world", process_request.template.first_render
+    get :render_action_hello_world
+    assert_template "test/hello_world"
+  end
+
+  def test_do_with_render_action_with_symbol
+    get :render_action_hello_world_with_symbol
+    assert_template "test/hello_world"
   end
 
   def test_do_with_render_text
-    @request.action = "render_text_hello_world"
-    assert_equal "hello world", process_request.body
+    get :render_text_hello_world
+    assert_equal "hello world", @response.body
   end
 
   def test_do_with_render_custom_code
-    @request.action = "render_custom_code"
-    assert_equal "404 Moved", process_request.headers["Status"]
+    get :render_custom_code
+    assert_response 404
   end
 
   def test_attempt_to_access_object_method
-    @request.action = "clone"
-    assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { process_request }
+    assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
   end
 
   def test_private_methods
-    @request.action = "determine_layout"
-    assert_raises(ActionController::UnknownAction, "No action responded to [determine_layout]") { process_request }
+    assert_raises(ActionController::UnknownAction, "No action responded to [determine_layout]") { get :determine_layout }
   end
 
   def test_access_to_request_in_view
@@ -163,86 +170,77 @@ class RenderTest < Test::Unit::TestCase
     ActionController::Base.view_controller_internals = false
     ActionController::Base.protected_variables_cache = nil
 
-    @request.action = "hello_world"
-    response = process_request
-    assert_nil response.template.assigns["request"]
+    get :hello_world
+    assert_nil assigns["request"]
 
     ActionController::Base.view_controller_internals = true
     ActionController::Base.protected_variables_cache = nil
 
-    @request.action = "hello_world"
-    response = process_request
-    assert_kind_of ActionController::AbstractRequest,  response.template.assigns["request"]
+    get :hello_world
+    assert_kind_of ActionController::AbstractRequest,  assigns["request"]
 
     ActionController::Base.view_controller_internals = view_internals_old_value
     ActionController::Base.protected_variables_cache = nil
   end
   
   def test_render_xml
-    @request.action = "render_xml_hello"
-    assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", process_request.body
+    get :render_xml_hello
+    assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
   end
 
   def test_render_xml_with_default
-    @request.action = "greeting"
-    assert_equal "<p>This is grand!</p>\n", process_request.body
+    get :greeting
+    assert_equal "<p>This is grand!</p>\n", @response.body
   end
 
   def test_layout_rendering
-    @request.action = "layout_test"
-    assert_equal "<html>Hello world!</html>", process_request.body
+    get :layout_test
+    assert_equal "<html>Hello world!</html>", @response.body
   end
 
   def test_render_xml_with_layouts
-    @request.action = "builder_layout_test"
-    assert_equal "<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", process_request.body
+    get :builder_layout_test
+    assert_equal "<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body
   end
 
   # def test_partials_list
-  #   @request.action = "partials_list"
+  #   get :partials_list
   #   assert_equal "goodbyeHello: davidHello: marygoodbye\n", process_request.body
   # end
 
   def test_partial_only
-    @request.action = "partial_only"
-    assert_equal "only partial", process_request.body
+    get :partial_only
+    assert_equal "only partial", @response.body
   end
 
   def test_render_to_string
-    @request.action = "hello_in_a_string"
-    assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", process_request.body
+    get :hello_in_a_string
+    assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
   end
 
   def test_render_to_string_resets_assigns
-    @request.action = "render_to_string_test"
-    assert_equal "The value of foo is: ::this is a test::\n", process_request.body
+    get :render_to_string_test
+    assert_equal "The value of foo is: ::this is a test::\n", @response.body
   end
 
   def test_nested_rendering
-    @request.action = "hello_world"
-    assert_equal "Living in a nested world", Fun::GamesController.process(@request, @response).body
+    @controller = Fun::GamesController.new
+    get :hello_world
+    assert_equal "Living in a nested world", @response.body
   end
 
   def test_accessing_params_in_template
-    @request.action = "accessing_params_in_template"
-    @request.query_parameters[:name] = "David"
-    assert_equal "Hello: David", process_request.body
+    get :accessing_params_in_template, :name => "David"
+    assert_equal "Hello: David", @response.body
   end
 
   def test_accessing_local_assigns_in_inline_template
-    @request.action = "accessing_local_assigns_in_inline_template"
-    @request.query_parameters[:local_name] = "Local David"
-    assert_equal "Goodbye, Local David", process_request.body
+    get :accessing_local_assigns_in_inline_template, :local_name => "Local David"
+    assert_equal "Goodbye, Local David", @response.body
   end
   
   def test_accessing_local_assigns_in_inline_template_with_string_keys
-    @request.action = "accessing_local_assigns_in_inline_template_with_string_keys"
-    @request.query_parameters[:local_name] = "Local David"
-    assert_equal "Goodbye, Local David", process_request.body
+    get :accessing_local_assigns_in_inline_template_with_string_keys, :local_name => "Local David"
+    assert_equal "Goodbye, Local David", @response.body
   end
-
-  private
-    def process_request
-      TestController.process(@request, @response)
-    end
 end