Skip to content
Browse files

Fix assert_template assertion with :layout option

  • Loading branch information...
1 parent 9ce057d commit df36c5f7ffd2657e11eea4e407401c9ff2aa0533 @avakhov avakhov committed Apr 11, 2012
View
2 actionpack/lib/action_controller/test_case.rb
@@ -120,7 +120,7 @@ def assert_template(options = {}, message = nil)
options[:partial], @partials.keys)
assert_includes @partials, expected_partial, msg
end
- else
+ elsif options.key?(:partial)
assert @partials.empty?,
"Expected no partials to be rendered"
end
View
10 actionpack/test/controller/action_pack_assertions_test.rb
@@ -76,6 +76,11 @@ def render_with_layout
render "test/hello_world", :layout => "layouts/standard"
end
+ def render_with_layout_and_partial
+ @variable_for_layout = nil
+ render "test/hello_world_with_partial", :layout => "layouts/standard"
+ end
+
def session_stuffing
session['xmas'] = 'turkey'
render :text => "ho ho ho"
@@ -478,6 +483,11 @@ def test_passes_with_correct_layout
assert_template :layout => "layouts/standard"
end
+ def test_passes_with_layout_and_partial
+ get :render_with_layout_and_partial
+ assert_template :layout => "layouts/standard"
+ end
+
def test_assert_template_reset_between_requests
get :hello_world
assert_template 'test/hello_world'
View
2 actionpack/test/fixtures/test/hello_world_with_partial.html.erb
@@ -0,0 +1,2 @@
+Hello world!
+<%= render '/test/partial' %>

0 comments on commit df36c5f

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