aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-12 10:13:16 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-12 10:13:16 -0700
commitfd22471313864c58cb911101d8c42e1fa46b4e42 (patch)
treebe7f11a84f404a0d2422231222766e688d134d4a /actionpack/test/template
parentdea486d00ed8b9beec767324dfd15bec72d8a1ca (diff)
parentb142bd84d83b222fca393355cdd76416648e5625 (diff)
downloadrails-fd22471313864c58cb911101d8c42e1fa46b4e42.tar.gz
rails-fd22471313864c58cb911101d8c42e1fa46b4e42.tar.bz2
rails-fd22471313864c58cb911101d8c42e1fa46b4e42.zip
Merge pull request #5375 from nertzy/assert_template_with_regexp
assert_template matches against Regexp
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/test_case_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 37858c1ba2..f2ed2ec609 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -277,6 +277,12 @@ module ActionView
end
class RenderTemplateTest < ActionView::TestCase
+ test "supports specifying templates with a Regexp" do
+ controller.controller_path = "fun"
+ render(:template => "fun/games/hello_world")
+ assert_template %r{\Afun/games/hello_world\Z}
+ end
+
test "supports specifying partials" do
controller.controller_path = "test"
render(:template => "test/calling_partial_with_layout")