mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Revert "Merge pull request #684 from teeparham/minitest_warnings"
This reverts commita1f3abcf33
, reversing changes made to1c0f1385da
.
This commit is contained in:
parent
a1f3abcf33
commit
7884fae7af
7 changed files with 13 additions and 13 deletions
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
require 'test_helper'
|
||||
|
||||
class EngineTest < MiniTest::Test
|
||||
class EngineTest < MiniTest::Unit::TestCase
|
||||
# A map of erroneous Haml documents to the error messages they should produce.
|
||||
# The error messages may be arrays;
|
||||
# if so, the second element should be the line number that should be reported for the error.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'test_helper'
|
||||
|
||||
class FiltersTest < MiniTest::Test
|
||||
class FiltersTest < MiniTest::Unit::TestCase
|
||||
test "should be registered as filters when including Haml::Filters::Base" do
|
||||
begin
|
||||
refute Haml::Filters.defined.has_key? "bar"
|
||||
|
@ -111,7 +111,7 @@ class FiltersTest < MiniTest::Test
|
|||
|
||||
end
|
||||
|
||||
class ErbFilterTest < MiniTest::Test
|
||||
class ErbFilterTest < MiniTest::Unit::TestCase
|
||||
test "multiline expressions should work" do
|
||||
html = "foobarbaz\n"
|
||||
haml = %Q{:erb\n <%= "foo" +\n "bar" +\n "baz" %>}
|
||||
|
@ -132,7 +132,7 @@ class ErbFilterTest < MiniTest::Test
|
|||
|
||||
end
|
||||
|
||||
class JavascriptFilterTest < MiniTest::Test
|
||||
class JavascriptFilterTest < MiniTest::Unit::TestCase
|
||||
test "should interpolate" do
|
||||
scope = Object.new.instance_eval {foo = "bar"; nil if foo; binding}
|
||||
haml = ":javascript\n \#{foo}"
|
||||
|
@ -178,7 +178,7 @@ class JavascriptFilterTest < MiniTest::Test
|
|||
end
|
||||
end
|
||||
|
||||
class CSSFilterTest < MiniTest::Test
|
||||
class CSSFilterTest < MiniTest::Unit::TestCase
|
||||
test "should wrap output in CDATA and a CSS tag when output is XHTML" do
|
||||
html = "<style type='text/css'>\n /*<![CDATA[*/\n foo\n /*]]>*/\n</style>\n"
|
||||
haml = ":css\n foo"
|
||||
|
@ -217,7 +217,7 @@ class CSSFilterTest < MiniTest::Test
|
|||
end
|
||||
end
|
||||
|
||||
class CDATAFilterTest < MiniTest::Test
|
||||
class CDATAFilterTest < MiniTest::Unit::TestCase
|
||||
test "should wrap output in CDATA tag" do
|
||||
html = "<![CDATA[\n foo\n]]>\n"
|
||||
haml = ":cdata\n foo"
|
||||
|
@ -225,7 +225,7 @@ class CDATAFilterTest < MiniTest::Test
|
|||
end
|
||||
end
|
||||
|
||||
class EscapedFilterTest < MiniTest::Test
|
||||
class EscapedFilterTest < MiniTest::Unit::TestCase
|
||||
test "should escape ampersands" do
|
||||
html = "&\n"
|
||||
haml = ":escaped\n &"
|
||||
|
@ -233,7 +233,7 @@ class EscapedFilterTest < MiniTest::Test
|
|||
end
|
||||
end
|
||||
|
||||
class RubyFilterTest < MiniTest::Test
|
||||
class RubyFilterTest < MiniTest::Unit::TestCase
|
||||
test "can write to haml_io" do
|
||||
haml = ":ruby\n haml_io.puts 'hello'\n"
|
||||
html = "hello\n"
|
||||
|
|
|
@ -16,7 +16,7 @@ module Haml::Helpers
|
|||
end
|
||||
end
|
||||
|
||||
class HelperTest < MiniTest::Test
|
||||
class HelperTest < MiniTest::Unit::TestCase
|
||||
Post = Struct.new('Post', :body, :error_field, :errors)
|
||||
class PostErrors
|
||||
def on(name)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'test_helper'
|
||||
|
||||
module Haml
|
||||
class ParserTest < MiniTest::Test
|
||||
class ParserTest < MiniTest::Unit::TestCase
|
||||
|
||||
test "should raise error for 'else' at wrong indent level" do
|
||||
begin
|
||||
|
|
|
@ -38,7 +38,7 @@ class DummyController
|
|||
end
|
||||
end
|
||||
|
||||
class TemplateTest < MiniTest::Test
|
||||
class TemplateTest < MiniTest::Unit::TestCase
|
||||
TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
|
||||
TEMPLATES = %w{ very_basic standard helpers
|
||||
whitespace_handling original_engine list helpful
|
||||
|
|
|
@ -36,7 +36,7 @@ module Declarative
|
|||
end
|
||||
end
|
||||
|
||||
class MiniTest::Test
|
||||
class MiniTest::Unit::TestCase
|
||||
|
||||
extend Declarative
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'test_helper'
|
||||
|
||||
class UtilTest < MiniTest::Test
|
||||
class UtilTest < MiniTest::Unit::TestCase
|
||||
include Haml::Util
|
||||
|
||||
def test_powerset
|
||||
|
|
Loading…
Add table
Reference in a new issue