test/tilt_coffeescripttemplate_test.rb in tilt-1.4.1 vs test/tilt_coffeescripttemplate_test.rb in tilt-2.0.0.beta1

@@ -1,23 +1,13 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'coffee_script'
+  require 'tilt/coffee'
 
-  class CoffeeScriptTemplateTest < Test::Unit::TestCase
+  class CoffeeScriptTemplateTest < Minitest::Test
 
-    unless method_defined?(:assert_not_match)
-      # assert_not_match is missing on 1.8.7, which uses assert_no_match
-      def assert_not_match(a, b)
-        unless a.kind_of?(Regexp)
-          a = Regexp.new(Regexp.escape(a))
-        end
-        assert_no_match(a,b)
-      end
-    end
-
     test "is registered for '.coffee' files" do
       assert_equal Tilt::CoffeeScriptTemplate, Tilt['test.coffee']
     end
 
     test "bare is disabled by default" do
@@ -40,15 +30,15 @@
       template = Tilt::CoffeeScriptTemplate.new { str }
       assert_match "(function() {", template.render
       assert_match "puts(\"Hello \" + name);\n", template.render
 
       template = Tilt::CoffeeScriptTemplate.new(:bare => true) { str }
-      assert_not_match "(function() {", template.render
+      refute_match "(function() {", template.render
       assert_equal "var name;\n\nname = \"Josh\";\n\nputs(\"Hello \" + name);\n", template.render
 
       template2 = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { str}
-      assert_not_match "(function() {", template.render
+      refute_match "(function() {", template.render
       assert_equal "var name;\n\nname = \"Josh\";\n\nputs(\"Hello \" + name);\n", template.render
     end
 
     context "wrapper globally enabled" do
       setup do
@@ -67,17 +57,17 @@
       end
 
       test "overridden by :bare" do
         template = Tilt::CoffeeScriptTemplate.new(:bare => true) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
         assert_match "puts(\"Hello, \" + name);", template.render
-        assert_not_match "(function() {", template.render
+        refute_match "(function() {", template.render
       end
 
       test "overridden by :no_wrap" do
         template = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
         assert_match "puts(\"Hello, \" + name);", template.render
-        assert_not_match "(function() {", template.render
+        refute_match "(function() {", template.render
       end
     end
 
     context "wrapper globally disabled" do
       setup do
@@ -90,10 +80,10 @@
       end
 
       test "no options" do
         template = Tilt::CoffeeScriptTemplate.new { |t| 'name = "Josh"; puts "Hello, #{name}"' }
         assert_match "puts(\"Hello, \" + name);", template.render
-        assert_not_match "(function() {", template.render
+        refute_match "(function() {", template.render
       end
 
       test "overridden by :bare" do
         template = Tilt::CoffeeScriptTemplate.new(:bare => false) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
         assert_match "puts(\"Hello, \" + name);", template.render