diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
| commit | 8037fee9ff1dd13c421e6689229457c1ef084074 (patch) | |
| tree | c60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /actionpack/test/controller/render_test.rb | |
| parent | 908b5305d4446433433313e315deb4083c58233e (diff) | |
| parent | 9f7eaea201b2f408d9effbf82f2731957e284adf (diff) | |
| download | rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2 rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 9e42d1738a..9934639d21 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -301,6 +301,9 @@ class TestController < ActionController::Base def render_implicit_html_template_from_xhr_request end + def render_implicit_js_template_without_layout + end + def formatted_html_erb end @@ -928,16 +931,13 @@ class RenderTest < ActionController::TestCase end def test_should_implicitly_render_html_template_from_xhr_request - pending - # xhr :get, :render_implicit_html_template_from_xhr_request - # assert_equal "XHR!\nHello HTML!", @response.body + xhr :get, :render_implicit_html_template_from_xhr_request + assert_equal "XHR!\nHello HTML!", @response.body end def test_should_implicitly_render_js_template_without_layout - pending do - get :render_implicit_js_template_without_layout, :format => :js - assert_no_match %r{<html>}, @response.body - end + get :render_implicit_js_template_without_layout, :format => :js + assert_no_match %r{<html>}, @response.body end def test_should_render_formatted_template |