tests: switch to minitest

Ruby 1.9+ uses Minitest as the backend for Test::Unit. As of Minitest 5,
the shim has broken some compatibility with Test::Unit::TestCase in some
scenarios.

Adjusts the test suite to support Minitest 5's syntax.

Minitest versions 4 and below do not support the newer Minitest::Test
class that arrived in version 5. For that case, use the
MiniTest::Unit::TestCase class as a fallback

Conflicts:
	test/integration/tags/for_tag_test.rb
	test/test_helper.rb
This commit is contained in:
Ken Dreyer
2014-07-28 16:36:38 +00:00
committed by Florian Weingarten
parent a8e63ff03d
commit ee4295c889
44 changed files with 148 additions and 173 deletions
+2 -5
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class BlockUnitTest < Test::Unit::TestCase
class BlockUnitTest < Minitest::Test
include Liquid
def test_blankspace
@@ -45,10 +45,7 @@ class BlockUnitTest < Test::Unit::TestCase
def test_with_custom_tag
Liquid::Template.register_tag("testtag", Block)
assert_nothing_thrown do
template = Liquid::Template.parse( "{% testtag %} {% endtesttag %}")
end
assert Liquid::Template.parse( "{% testtag %} {% endtesttag %}")
end
private
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class ConditionUnitTest < Test::Unit::TestCase
class ConditionUnitTest < Minitest::Test
include Liquid
def test_basic_condition
+6 -8
View File
@@ -63,7 +63,7 @@ class ArrayLike
end
end
class ContextUnitTest < Test::Unit::TestCase
class ContextUnitTest < Minitest::Test
include Liquid
def setup
@@ -107,16 +107,14 @@ class ContextUnitTest < Test::Unit::TestCase
end
def test_scoping
assert_nothing_raised do
@context.push
@context.push
@context.pop
assert_raises(Liquid::ContextError) do
@context.pop
end
assert_raise(Liquid::ContextError) do
@context.pop
end
assert_raise(Liquid::ContextError) do
assert_raises(Liquid::ContextError) do
@context.push
@context.pop
@context.pop
+5 -5
View File
@@ -1,10 +1,10 @@
require 'test_helper'
class FileSystemUnitTest < Test::Unit::TestCase
class FileSystemUnitTest < Minitest::Test
include Liquid
def test_default
assert_raise(FileSystemError) do
assert_raises(FileSystemError) do
BlankFileSystem.new.read_template_file("dummy", {'dummy'=>'smarty'})
end
end
@@ -14,15 +14,15 @@ class FileSystemUnitTest < Test::Unit::TestCase
assert_equal "/some/path/_mypartial.liquid" , file_system.full_path("mypartial")
assert_equal "/some/path/dir/_mypartial.liquid", file_system.full_path("dir/mypartial")
assert_raise(FileSystemError) do
assert_raises(FileSystemError) do
file_system.full_path("../dir/mypartial")
end
assert_raise(FileSystemError) do
assert_raises(FileSystemError) do
file_system.full_path("/dir/../../dir/mypartial")
end
assert_raise(FileSystemError) do
assert_raises(FileSystemError) do
file_system.full_path("/etc/passwd")
end
end
+3 -3
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class I18nUnitTest < Test::Unit::TestCase
class I18nUnitTest < Minitest::Test
include Liquid
def setup
@@ -20,13 +20,13 @@ class I18nUnitTest < Test::Unit::TestCase
end
# def test_raises_translation_error_on_undefined_interpolation_key
# assert_raise I18n::TranslationError do
# assert_raises I18n::TranslationError do
# @i18n.translate("whatever", :oopstypos => "yes")
# end
# end
def test_raises_unknown_translation
assert_raise I18n::TranslationError do
assert_raises I18n::TranslationError do
@i18n.translate("doesnt_exist")
end
end
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class LexerUnitTest < Test::Unit::TestCase
class LexerUnitTest < Minitest::Test
include Liquid
def test_strings
+1 -1
View File
@@ -36,7 +36,7 @@ class TestClassC::LiquidDropClass
end
end
class ModuleExUnitTest < Test::Unit::TestCase
class ModuleExUnitTest < Minitest::Test
include Liquid
def setup
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class ParserUnitTest < Test::Unit::TestCase
class ParserUnitTest < Minitest::Test
include Liquid
def test_consume
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class RegexpUnitTest < Test::Unit::TestCase
class RegexpUnitTest < Minitest::Test
include Liquid
def test_empty
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class StrainerUnitTest < Test::Unit::TestCase
class StrainerUnitTest < Minitest::Test
include Liquid
module AccessScopeFilters
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class TagUnitTest < Test::Unit::TestCase
class TagUnitTest < Minitest::Test
include Liquid
def test_tag
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class CaseTagUnitTest < Test::Unit::TestCase
class CaseTagUnitTest < Minitest::Test
include Liquid
def test_case_nodelist
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class ForTagUnitTest < Test::Unit::TestCase
class ForTagUnitTest < Minitest::Test
def test_for_nodelist
template = Liquid::Template.parse('{% for item in items %}FOR{% endfor %}')
assert_equal ['FOR'], template.root.nodelist[0].nodelist
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class IfTagUnitTest < Test::Unit::TestCase
class IfTagUnitTest < Minitest::Test
def test_if_nodelist
template = Liquid::Template.parse('{% if true %}IF{% else %}ELSE{% endif %}')
assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class TemplateUnitTest < Test::Unit::TestCase
class TemplateUnitTest < Minitest::Test
include Liquid
def test_sets_default_localization_in_document
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class TokenizerTest < Test::Unit::TestCase
class TokenizerTest < Minitest::Test
def test_tokenize_strings
assert_equal [' '], tokenize(' ')
assert_equal ['hello world'], tokenize('hello world')
+1 -1
View File
@@ -1,6 +1,6 @@
require 'test_helper'
class VariableUnitTest < Test::Unit::TestCase
class VariableUnitTest < Minitest::Test
include Liquid
def test_variable