Skip to content
Browse files

Tests and tweaks for components

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@706 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0011116 commit cf6d77600ac132fd3f840c8e57d8e139da39f675 @dhh dhh committed
Showing with 14 additions and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/components.rb
  2. +13 −0 actionpack/test/controller/components_test.rb
View
2 actionpack/lib/action_controller/components.rb
@@ -22,7 +22,7 @@ def component_class(options)
def component_request(options)
component_request = @request.dup
- component_request.send(:instance_variable_set, :@parameters, options[:params].merge({ "controller" => options[:controller], "action" => options[:action] }))
+ component_request.send(:instance_variable_set, :@parameters, (options[:params] || {}).merge({ "controller" => options[:controller], "action" => options[:action] }))
component_request
end
end
View
13 actionpack/test/controller/components_test.rb
@@ -9,6 +9,10 @@ def calling_from_controller_with_params
render_component(:controller => "callee", :action => "being_called", :params => { "name" => "David" })
end
+ def calling_from_controller_with_different_status_code
+ render_component(:controller => "callee", :action => "blowing_up")
+ end
+
def calling_from_template
render_template "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>"
end
@@ -20,6 +24,10 @@ class CalleeController < ActionController::Base
def being_called
render_text "#{@params["name"] || "Lady"} of the House, speaking"
end
+
+ def blowing_up
+ render_text "It's game over, man, just game over, man!", "500 Internal Server Error"
+ end
def rescue_action(e) raise end
end
@@ -40,6 +48,11 @@ def test_calling_from_controller_with_params
get :calling_from_controller_with_params
assert_equal "David of the House, speaking", @response.body
end
+
+ def test_calling_from_controller_with_different_status_code
+ get :calling_from_controller_with_different_status_code
+ assert_equal 500, @response.response_code
+ end
def test_calling_from_template
get :calling_from_template

0 comments on commit cf6d776

Please sign in to comment.
Something went wrong with that request. Please try again.