aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/render_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-03 21:08:27 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-03 21:09:37 -0500
commit01637796d712943ebf9e9a76aa5c708edfab4d02 (patch)
tree44144464c4d6d65a050dcdfa90b01fc2fd1ff19a /actionpack/test/template/render_test.rb
parentbad1eac91d1549631dca8e93e7e846911649acf7 (diff)
downloadrails-01637796d712943ebf9e9a76aa5c708edfab4d02.tar.gz
rails-01637796d712943ebf9e9a76aa5c708edfab4d02.tar.bz2
rails-01637796d712943ebf9e9a76aa5c708edfab4d02.zip
Revert "Moved TemplateHandlers to Base"
This reverts commit 42d215a925a228778e43f7040f03ad8f3eb5341c. Conflicts: actionpack/lib/action_view/inline_template.rb actionpack/lib/action_view/template.rb
Diffstat (limited to 'actionpack/test/template/render_test.rb')
-rw-r--r--actionpack/test/template/render_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 0dcf88da83..726cf37026 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -101,12 +101,12 @@ class ViewRenderTest < Test::Unit::TestCase
end
def test_render_inline_with_custom_type
- ActionView::Base.register_template_handler :foo, CustomHandler
+ ActionView::Template.register_template_handler :foo, CustomHandler
assert_equal '["Hello, World!", {}]', @view.render(:inline => "Hello, World!", :type => :foo)
end
def test_render_inline_with_locals_and_custom_type
- ActionView::Base.register_template_handler :foo, CustomHandler
+ ActionView::Template.register_template_handler :foo, CustomHandler
assert_equal '["Hello, <%= name %>!", {:name=>"Josh"}]', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
end
@@ -121,12 +121,12 @@ class ViewRenderTest < Test::Unit::TestCase
end
def test_render_inline_with_compilable_custom_type
- ActionView::Base.register_template_handler :foo, CompilableCustomHandler
+ ActionView::Template.register_template_handler :foo, CompilableCustomHandler
assert_equal 'locals: {}, source: "Hello, World!"', @view.render(:inline => "Hello, World!", :type => :foo)
end
def test_render_inline_with_locals_and_compilable_custom_type
- ActionView::Base.register_template_handler :foo, CompilableCustomHandler
+ ActionView::Template.register_template_handler :foo, CompilableCustomHandler
assert_equal 'locals: {:name=>"Josh"}, source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
end
end