From b1ba333ea72b8aa8fc5ffeda4067c128afb026e4 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 2 Jul 2014 15:36:23 -0700
Subject: Fix assert_template for files.

The test was not failing for `assert_template file: nil` when a file
has been rendered.
---
 .../test/controller/action_pack_assertions_test.rb | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'actionpack/test/controller')

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b6b5a218cc..311302819e 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -488,6 +488,11 @@ class AssertTemplateTest < ActionController::TestCase
     assert_raise(ActiveSupport::TestCase::Assertion) do
       assert_template :file => 'test/hello_world'
     end
+
+    get :render_file_absolute_path
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template file: nil
+    end
   end
 
   def test_with_nil_passes_when_no_template_rendered
@@ -612,6 +617,24 @@ class AssertTemplateTest < ActionController::TestCase
 
     get :nothing
     assert_template nil
+
+    get :partial
+    assert_template partial: 'test/_partial'
+
+    get :nothing
+    assert_template partial: nil
+
+    get :render_with_layout
+    assert_template layout: 'layouts/standard'
+
+    get :nothing
+    assert_template layout: nil
+
+    get :render_file_relative_path
+    assert_template file: 'README.rdoc'
+
+    get :nothing
+    assert_template file: nil
   end
 end
 
-- 
cgit v1.2.3