test/tilt_erbtemplate_test.rb in tilt-1.2.2 vs test/tilt_erbtemplate_test.rb in tilt-1.3

@@ -4,16 +4,15 @@
 require 'erb'
 require 'tempfile'
 
 class ERBTemplateTest < Test::Unit::TestCase
   test "registered for '.erb' files" do
-    assert_equal Tilt::ERBTemplate, Tilt['test.erb']
-    assert_equal Tilt::ERBTemplate, Tilt['test.html.erb']
+    assert Tilt.mappings['erb'].include?(Tilt::ERBTemplate)
   end
 
   test "registered for '.rhtml' files" do
-    assert_equal Tilt::ERBTemplate, Tilt['test.rhtml']
+    assert Tilt.mappings['rhtml'].include?(Tilt::ERBTemplate)
   end
 
   test "loading and evaluating templates on #render" do
     template = Tilt::ERBTemplate.new { |t| "Hello World!" }
     assert_equal "Hello World!", template.render
@@ -65,13 +64,13 @@
     begin
       template.render
       fail 'should have raised an exception'
     rescue => boom
       assert_kind_of NameError, boom
-      line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.erb:/).first
+      assert line, "Backtrace didn't contain test.erb"
       file, line, meth = line.split(":")
-      assert_equal 'test.erb', file
       assert_equal '13', line
     end
   end
 
   test "backtrace file and line reporting with locals" do
@@ -88,22 +87,22 @@
       assert_equal 'test.erb', file
       assert_equal '6', line
     end
   end
 
-  test "default non-stripping trim mode" do
-    template = Tilt.new('test.erb', 1) { "\n<%= 1 + 1 %>\n" }
-    assert_equal "\n2\n", template.render
+  test "default stripping trim mode" do
+    template = Tilt::ERBTemplate.new('test.erb', 1) { "\n<%= 1 + 1 %>\n" }
+    assert_equal "\n2", template.render
   end
 
   test "stripping trim mode" do
-    template = Tilt.new('test.erb', 1, :trim => '-') { "\n<%= 1 + 1 -%>\n" }
+    template = Tilt::ERBTemplate.new('test.erb', 1, :trim => '-') { "\n<%= 1 + 1 -%>\n" }
     assert_equal "\n2", template.render
   end
 
   test "shorthand whole line syntax trim mode" do
-    template = Tilt.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
+    template = Tilt::ERBTemplate.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
     assert_equal "\nhello\n", template.render
   end
 
   test "using an instance variable as the outvar" do
     template = Tilt::ERBTemplate.new(nil, :outvar => '@buf') { "<%= 1 + 1 %>" }
@@ -162,13 +161,13 @@
     begin
       template.render(Scope.new)
       fail 'should have raised an exception'
     rescue => boom
       assert_kind_of NameError, boom
-      line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.erb:/).first
+      assert line, "Backtrace didn't contain test.erb"
       file, line, meth = line.split(":")
-      assert_equal 'test.erb', file
       assert_equal '13', line
     end
   end
 
   test "backtrace file and line reporting with locals" do
@@ -185,41 +184,41 @@
       assert_equal 'test.erb', file
       assert_equal '6', line
     end
   end
 
-  test "default non-stripping trim mode" do
-    template = Tilt.new('test.erb') { "\n<%= 1 + 1 %>\n" }
-    assert_equal "\n2\n", template.render(Scope.new)
+  test "default stripping trim mode" do
+    template = Tilt::ERBTemplate.new('test.erb') { "\n<%= 1 + 1 %>\n" }
+    assert_equal "\n2", template.render(Scope.new)
   end
 
   test "stripping trim mode" do
-    template = Tilt.new('test.erb', :trim => '-') { "\n<%= 1 + 1 -%>\n" }
+    template = Tilt::ERBTemplate.new('test.erb', :trim => '-') { "\n<%= 1 + 1 -%>\n" }
     assert_equal "\n2", template.render(Scope.new)
   end
 
   test "shorthand whole line syntax trim mode" do
-    template = Tilt.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
+    template = Tilt::ERBTemplate.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
     assert_equal "\nhello\n", template.render(Scope.new)
   end
 
   test "encoding with magic comment" do
     f = Tempfile.open("template")
     f.puts('<%# coding: UTF-8 %>')
     f.puts('ふが <%= @hoge %>')
     f.close()
     @hoge = "ほげ"
-    erb = Tilt['erb'].new(f.path)
+    erb = Tilt::ERBTemplate.new(f.path)
     3.times { erb.render(self) }
     f.delete
   end
 
   test "encoding with :default_encoding" do
     f = Tempfile.open("template")
     f.puts('ふが <%= @hoge %>')
     f.close()
     @hoge = "ほげ"
-    erb = Tilt['erb'].new(f.path, :default_encoding => 'UTF-8')
+    erb = Tilt::ERBTemplate.new(f.path, :default_encoding => 'UTF-8')
     3.times { erb.render(self) }
     f.delete
   end
 end