diff options
| author | Mack Earnhardt <mack@agilereasoning.com> | 2013-03-24 07:54:55 -0400 |
|---|---|---|
| committer | Mack Earnhardt <mack@agilereasoning.com> | 2013-03-24 08:16:26 -0400 |
| commit | 74e59ea8b674fac08a6ea4da03e58e29fc57a709 (patch) | |
| tree | e450d94452a4d59fd3cd112a9c414cbea9014175 /actionpack/test | |
| parent | 029dd435e4e13eb4c9490fc0d65f5f976bdffa0a (diff) | |
| download | rails-74e59ea8b674fac08a6ea4da03e58e29fc57a709.tar.gz rails-74e59ea8b674fac08a6ea4da03e58e29fc57a709.tar.bz2 rails-74e59ea8b674fac08a6ea4da03e58e29fc57a709.zip | |
Backport #5808
df36c5f - Fix assert_template assertion with :layout option
4bd05a7 - Fix assert_template :layout => nil assertion
0d19a08 - Improve assert_template layout checking
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 37 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/hello_world_with_partial.html.erb | 2 |
2 files changed, 39 insertions, 0 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index 5252e43c25..3b5a515e84 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -76,6 +76,11 @@ class ActionPackAssertionsController < ActionController::Base 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" @@ -483,11 +488,43 @@ class AssertTemplateTest < ActionController::TestCase end end + def test_fails_expecting_no_layout + get :render_with_layout + assert_raise(ActiveSupport::TestCase::Assertion) do + assert_template :layout => nil + end + end + def test_passes_with_correct_layout get :render_with_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_passed_with_no_layout + get :hello_world + assert_template :layout => nil + end + + def test_passed_with_no_layout_false + get :hello_world + assert_template :layout => false + end + + def test_passes_with_correct_layout_without_layouts_prefix + get :render_with_layout + assert_template :layout => "standard" + end + + def test_passes_with_correct_layout_symbol + get :render_with_layout + assert_template :layout => :standard + end + def test_assert_template_reset_between_requests get :hello_world assert_template 'test/hello_world' diff --git a/actionpack/test/fixtures/test/hello_world_with_partial.html.erb b/actionpack/test/fixtures/test/hello_world_with_partial.html.erb new file mode 100644 index 0000000000..ec31545356 --- /dev/null +++ b/actionpack/test/fixtures/test/hello_world_with_partial.html.erb @@ -0,0 +1,2 @@ +Hello world! +<%= render '/test/partial' %> |