actionpack 1.9.1 → 1.10.1

data/test/controller/components_test.rb

@@ -25,6 +25,22 @@ class CallerController < ActionController::Base
     render_text "Yes, ma'am"
   end
 
+  def set_flash
+    render_component(:controller => "callee", :action => "set_flash")
+  end
+
+  def use_flash
+    render_component(:controller => "callee", :action => "use_flash")
+  end
+  
+  def calling_redirected
+    render_component(:controller => "callee", :action => "redirected")
+  end
+  
+  def calling_redirected_as_string
+    render_template "<%= render_component(:controller => 'callee', :action => 'redirected') %>"
+  end
+
   def rescue_action(e) raise end
 end
 
@@ -36,6 +52,19 @@ class CalleeController < ActionController::Base
   def blowing_up
     render_text "It's game over, man, just game over, man!", "500 Internal Server Error"
   end
+  
+  def set_flash
+    flash[:notice] = 'My stoney baby'
+    render :text => 'flash is set'
+  end
+  
+  def use_flash
+    render :text => flash[:notice] || 'no flash'
+  end
+  
+  def redirected
+    redirect_to :controller => "callee", :action => "being_called"
+  end
 
   def rescue_action(e) raise end
 end
@@ -71,4 +100,25 @@ class ComponentsTest < Test::Unit::TestCase
     get :internal_caller
     assert_equal "Are you there? Yes, ma'am", @response.body
   end
+  
+  def test_flash
+    get :set_flash
+    assert_equal 'My stoney baby', flash[:notice]
+    get :use_flash
+    assert_equal 'My stoney baby', @response.body
+    get :use_flash
+    assert_equal 'no flash', @response.body
+  end
+  
+  def test_component_redirect_redirects
+    get :calling_redirected
+    
+    assert_redirected_to :action => "being_called"
+  end
+  
+  def test_component_as_string_redirect_renders_redirecte_action
+    get :calling_redirected_as_string
+    
+    assert_equal "Lady of the House, speaking", @response.body
+  end
 end

data/test/controller/custom_handler_test.rb

@@ -19,15 +19,15 @@ class CustomHandlerTest < Test::Unit::TestCase
   end
 
   def test_custom_render
-    result = @view.render_template( "foo", "hello <%= one %>", "one" => "two" )
+    result = @view.render_template( "foo", "hello <%= one %>", nil, :one => "two" )
     assert_equal(
-      [ "hello <%= one %>", { "one" => "two" }, @view ],
+      [ "hello <%= one %>", { :one => "two" }, @view ],
       result )
   end
 
   def test_unhandled_extension
     # uses the ERb handler by default if the extension isn't recognized
-    result = @view.render_template( "bar", "hello <%= one %>", "one" => "two" )
+    result = @view.render_template( "bar", "hello <%= one %>", nil, :one => "two" )
     assert_equal "hello two", result
   end
 end

data/test/controller/fake_controllers.rb

@@ -0,0 +1,24 @@
+module Object::Controllers
+  def self.const_available?(*args)
+    const_defined?(*args)
+  end
+  
+  class ContentController < ActionController::Base
+  end
+
+  module Admin
+    def self.const_available?(*args)
+      const_defined?(*args)
+    end
+    
+    class UserController < ActionController::Base
+    end
+    class NewsFeedController < ActionController::Base
+    end
+  end
+end
+
+ActionController::Routing::Routes.draw do |map|
+  map.route_one 'route_one', :controller => 'elsewhere', :action => 'flash_me'
+  map.connect ':controller/:action/:id'
+end

data/test/controller/filters_test.rb

@@ -5,7 +5,7 @@ class FilterTest < Test::Unit::TestCase
     before_filter :ensure_login
 
     def show
-      render_text "ran action"
+      render :inline => "ran action"
     end
 
     private
@@ -20,26 +20,26 @@ class FilterTest < Test::Unit::TestCase
 
     def show
       @ran_action = true
-      render_text "ran action"
+      render :inline => "ran action"
     end
 
     private
       def render_something_else
-        render_text "something else"
+        render :inline => "something else"
       end
   end
   
   class ConditionalFilterController < ActionController::Base
     def show
-      render_text "ran action"
+      render :inline => "ran action"
     end
 
     def another_action
-      render_text "ran action"
+      render :inline => "ran action"
     end
 
     def show_without_filter
-      render_text "ran action without filter"
+      render :inline => "ran action without filter"
     end
 
     private

data/test/controller/flash_test.rb

@@ -4,32 +4,32 @@ class FlashTest < Test::Unit::TestCase
   class TestController < ActionController::Base
     def set_flash
       flash["that"] = "hello"
-      render_text "hello"
+      render :inline => "hello"
     end
 
     def set_flash_now
       flash.now["that"] = "hello"
       @flash_copy = {}.update flash
-      render_text "hello"
+      render :inline => "hello"
     end
 
     def attempt_to_use_flash_now
       @flash_copy = {}.update flash
       @flashy = flash["that"]
-      render_text "hello"
+      render :inline => "hello"
     end
 
     def use_flash
       @flash_copy = {}.update flash
       @flashy = flash["that"]
-      render_text "hello"
+      render :inline => "hello"
     end
 
     def use_flash_and_keep_it
       @flash_copy = {}.update flash
       @flashy = flash["that"]
       keep_flash
-      render_text "hello"
+      render :inline => "hello"
     end
 
     def rescue_action(e)
@@ -91,4 +91,4 @@ class FlashTest < Test::Unit::TestCase
     def process_request
       TestController.process(@request, @response)
     end
-end
+end

data/test/controller/fragment_store_setting_test.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+MemCache = Struct.new(:MemCache, :address) unless Object.const_defined?(:MemCache)
+
+class FragmentCacheStoreSettingTest < Test::Unit::TestCase
+  def teardown
+    ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::MemoryStore.new
+  end
+  
+  def test_file_fragment_cache_store
+    ActionController::Base.fragment_cache_store = :file_store, "/path/to/cache/directory"
+    assert_kind_of(
+      ActionController::Caching::Fragments::FileStore,
+      ActionController::Base.fragment_cache_store
+    )
+    assert_equal "/path/to/cache/directory", ActionController::Base.fragment_cache_store.cache_path
+  end
+  
+  def test_drb_fragment_cache_store
+    ActionController::Base.fragment_cache_store = :drb_store, "druby://localhost:9192"
+    assert_kind_of(
+      ActionController::Caching::Fragments::DRbStore,
+      ActionController::Base.fragment_cache_store
+    )
+    assert_equal "druby://localhost:9192", ActionController::Base.fragment_cache_store.address
+  end
+  
+  def test_mem_cache_fragment_cache_store
+    ActionController::Base.fragment_cache_store = :mem_cache_store, "localhost"
+    assert_kind_of(
+      ActionController::Caching::Fragments::MemCacheStore,
+      ActionController::Base.fragment_cache_store
+    )
+    assert_equal "localhost", ActionController::Base.fragment_cache_store.address
+  end
+
+  def test_object_assigned_fragment_cache_store
+    ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new("/path/to/cache/directory")
+    assert_kind_of(
+      ActionController::Caching::Fragments::FileStore,
+      ActionController::Base.fragment_cache_store
+    )
+    assert_equal "/path/to/cache/directory", ActionController::Base.fragment_cache_store.cache_path
+  end
+end

data/test/controller/helper_test.rb

@@ -121,9 +121,7 @@ class HelperTest < Test::Unit::TestCase
     end
 
     def test_helper=(helper_module)
-      old_verbose, $VERBOSE = $VERBOSE, nil
-      self.class.const_set('TestHelper', helper_module)
-      $VERBOSE = old_verbose
+      silence_warnings { self.class.const_set('TestHelper', helper_module) }
     end
 end
 

data/test/controller/new_render_test.rb

@@ -59,6 +59,10 @@ class NewRenderTestController < ActionController::Base
   def rendering_without_layout
     render :action => "hello_world", :layout => false
   end
+
+  def layout_overriding_layout
+    render :action => "hello_world", :layout => "standard"
+  end
   
   def rendering_nothing_on_layout
     render :nothing => true
@@ -81,7 +85,32 @@ class NewRenderTestController < ActionController::Base
   def partial_only_with_layout
     render :partial => "partial_only", :layout => true
   end
+  
+  def partial_with_locals
+    render :partial => "customer", :locals => { :customer => Customer.new("david") } 
+  end
+  
+  def partial_collection
+    render :partial => "customer", :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 empty_partial_collection
+    render :partial => "customer", :collection => []
+  end
+  
+  def partial_with_hash_object
+    render :partial => "hash_object", :object => {:first_name => "Sam"}
+  end
 
+  def partial_with_implicit_local_assignment
+    @customer = Customer.new("Marcel")
+    render :partial => "customer"
+  end
+  
   def hello_in_a_string
     @customers = [ Customer.new("david"), Customer.new("mary") ]
     render :text =>  "How's there? #{render_to_string("test/list")}"
@@ -92,7 +121,7 @@ class NewRenderTestController < ActionController::Base
   end
 
   def accessing_params_in_template_with_layout
-    render :inline =>  "Hello: <%= params[:name] %>", :layout => nil
+    render :layout => nil, :inline =>  "Hello: <%= params[:name] %>"
   end
 
   def render_with_explicit_template
@@ -114,6 +143,25 @@ class NewRenderTestController < ActionController::Base
     redirect_to :action => "double_render"
   end
 
+  def rendering_with_conflicting_local_vars
+    @name = "David"
+    def @template.name() nil end
+    render :action => "potential_conflicts"
+  end
+
+  def action_talk_to_layout
+    # Action template sets variable that's picked up by layout
+  end
+
+  def render_text_with_assigns
+    @hello = "world"
+    render :text => "foo"
+  end
+
+  def yield_content_for
+    render :action => "content_for", :layout => "yield"
+  end
+
   def rescue_action(e) raise end
     
   private
@@ -128,6 +176,8 @@ class NewRenderTestController < ActionController::Base
           "layouts/standard"
         when "builder_layout_test"
           "layouts/builder"
+        when "action_talk_to_layout", "layout_overriding_layout"
+          "layouts/talk_from_action"
       end
     end
 end
@@ -190,15 +240,22 @@ 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_nil(assigns["request"])
 
     ActionController::Base.view_controller_internals = true
+    ActionController::Base.protected_variables_cache = nil
 
     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
@@ -226,9 +283,14 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal "Hello world!", @response.body
   end
 
+  def test_layout_overriding_layout
+    get :layout_overriding_layout
+    assert_no_match %r{<title>}, @response.body
+  end
+
   def test_rendering_nothing_on_layout
     get :rendering_nothing_on_layout
-    assert_equal "", @response.body
+    assert_equal " ", @response.body
   end
 
   def test_render_xml_with_layouts
@@ -236,11 +298,6 @@ class NewRenderTest < Test::Unit::TestCase
     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
-  #   get :partials_list
-  #   assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body
-  # end
-
   def test_partial_only
     get :partial_only
     assert_equal "only partial", @response.body
@@ -287,4 +344,59 @@ class NewRenderTest < Test::Unit::TestCase
   def test_render_and_redirect
     assert_raises(ActionController::DoubleRenderError) { get :render_and_redirect }
   end
+
+  def test_rendering_with_conflicting_local_vars
+    get :rendering_with_conflicting_local_vars
+    assert_equal("First: David\nSecond: Stephan\nThird: David\nFourth: David\nFifth: ", @response.body)
+  end
+
+  def test_action_talk_to_layout
+    get :action_talk_to_layout
+    assert_equal "<title>Talking to the layout</title>\nAction was here!", @response.body
+  end
+
+  def test_partials_list
+    get :partials_list
+    assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body
+  end
+  
+  def test_partial_with_locals
+    get :partial_with_locals
+    assert_equal "Hello: david", @response.body
+  end
+
+  def test_partial_collection
+    get :partial_collection
+    assert_equal "Hello: davidHello: mary", @response.body
+  end
+
+  def test_partial_collection_with_locals
+    get :partial_collection_with_locals
+    assert_equal "Bonjour: davidBonjour: mary", @response.body
+  end
+
+  def test_empty_partial_collection
+    get :empty_partial_collection
+    assert_equal " ", @response.body
+  end
+
+  def test_partial_with_hash_object
+    get :partial_with_hash_object
+    assert_equal "Sam", @response.body
+  end
+
+  def test_partial_with_implicit_local_assignment
+    get :partial_with_implicit_local_assignment
+    assert_equal "Hello: Marcel", @response.body
+  end
+  
+  def test_render_text_with_assigns
+    get :render_text_with_assigns
+    assert_equal "world", assigns["hello"]
+  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
 end