diff options
Diffstat (limited to 'actionpack/test')
4 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/test/controller/custom_handler_test.rb b/actionpack/test/controller/custom_handler_test.rb index cdde00cccc..cf1e2361bd 100644 --- a/actionpack/test/controller/custom_handler_test.rb +++ b/actionpack/test/controller/custom_handler_test.rb @@ -14,8 +14,8 @@ end class CustomHandlerTest < Test::Unit::TestCase def setup - ActionView::Base.register_template_handler "foo", CustomHandler - ActionView::Base.register_template_handler :foo2, CustomHandler + ActionView::Template.register_template_handler "foo", CustomHandler + ActionView::Template.register_template_handler :foo2, CustomHandler @view = ActionView::Base.new end diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 56d7f69774..c8507af532 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -40,7 +40,7 @@ class MabView < ActionView::TemplateHandler end end -ActionView::Base::register_template_handler :mab, MabView +ActionView::Template::register_template_handler :mab, MabView class LayoutAutoDiscoveryTest < Test::Unit::TestCase def setup diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb index b969575235..73e7ec1d76 100644 --- a/actionpack/test/template/compiled_templates_test.rb +++ b/actionpack/test/template/compiled_templates_test.rb @@ -91,7 +91,7 @@ class CompiledTemplateTests < Test::Unit::TestCase tb = ActionView::Template.new(v, @b, false, {}) ts = ActionView::Template.new(v, @s, false, {}) - @handler_class = ActionView::Base.handler_class_for_extension(:rhtml) + @handler_class = ActionView::Template.handler_class_for_extension(:rhtml) @handler = @handler_class.new(v) # All templates were created at t+1 diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb index 6cd6957a0b..2b9569f099 100644 --- a/actionpack/test/template/template_finder_test.rb +++ b/actionpack/test/template/template_finder_test.rb @@ -6,7 +6,7 @@ class TemplateFinderTest < Test::Unit::TestCase def setup ActionView::TemplateFinder.process_view_paths(LOAD_PATH_ROOT) - ActionView::Base::register_template_handler :mab, Class.new(ActionView::TemplateHandler) + ActionView::Template::register_template_handler :mab, Class.new(ActionView::TemplateHandler) @template = ActionView::Base.new @finder = ActionView::TemplateFinder.new(@template, LOAD_PATH_ROOT) end @@ -35,7 +35,7 @@ class TemplateFinderTest < Test::Unit::TestCase def test_should_update_extension_cache_when_template_handler_is_registered ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky") - ActionView::Base::register_template_handler :funky, Class.new(ActionView::TemplateHandler) + ActionView::Template::register_template_handler :funky, Class.new(ActionView::TemplateHandler) end end |