Register trackers on extensions, not handlers

2 files changed, 6 insertions, 5 deletions

diff --git a/actionpack/test/template/dependency_tracker_test.rb b/actionpack/test/template/dependency_tracker_test.rb
index 714e2d6b29..9c68afbdbd 100644
--- a/actionpack/test/template/dependency_tracker_test.rb
+++ b/actionpack/test/template/dependency_tracker_test.rb
@@ -2,8 +2,8 @@ require 'abstract_unit'
 require 'action_view/dependency_tracker'
 
 class DependencyTrackerTest < ActionView::TestCase
-  Neckbeard = Class.new
-  Bowtie = Class.new
+  Neckbeard = lambda {|template| template.source }
+  Bowtie = lambda {|template| template.source }
 
   class NeckbeardTracker
     def self.call(name, template)
@@ -24,11 +24,12 @@ class DependencyTrackerTest < ActionView::TestCase
   end
 
   def setup
-    tracker.register_tracker(Neckbeard, NeckbeardTracker)
+    ActionView::Template.register_template_handler :neckbeard, Neckbeard
+    tracker.register_tracker(:neckbeard, NeckbeardTracker)
   end
 
   def teardown
-    tracker.remove_tracker(Neckbeard)
+    tracker.remove_tracker(:neckbeard)
   end
 
   def test_finds_tracker_by_template_handler
diff --git a/actionpack/test/template/digestor_test.rb b/actionpack/test/template/digestor_test.rb
index 272ffec26e..e29cecabc0 100644
--- a/actionpack/test/template/digestor_test.rb
+++ b/actionpack/test/template/digestor_test.rb
@@ -6,7 +6,7 @@ class FixtureTemplate
 
   def initialize(template_path)
     @source = File.read(template_path)
-    @handler = ActionView::Template::Handlers::ERB
+    @handler = ActionView::Template.handler_for_extension(:erb)
   rescue Errno::ENOENT
     raise ActionView::MissingTemplate.new([], "", [], true, [])
   end