Skip to content

Commit

Permalink
Removes turn and switches test/unit for minitest
Browse files Browse the repository at this point in the history
  • Loading branch information
locks committed Dec 1, 2014
1 parent 3424b84 commit 4e695ad
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 21 deletions.
16 changes: 4 additions & 12 deletions Rakefile
Expand Up @@ -16,18 +16,10 @@ end

task :default => :test

if command? :turn
desc "Run tests"
task :test do
suffix = "-n #{ENV['TEST']}" if ENV['TEST']
sh "turn test/*.rb #{suffix}"
end
else
Rake::TestTask.new do |t|
t.libs << 'lib'
t.pattern = 'test/**/*_test.rb'
t.verbose = false
end
Rake::TestTask.new do |t|
t.libs << 'lib'
t.pattern = 'test/**/*_test.rb'
t.verbose = false
end


Expand Down
2 changes: 1 addition & 1 deletion mustache.gemspec
Expand Up @@ -45,7 +45,7 @@ desc

s.add_development_dependency 'bundler', '~> 1.6'
s.add_development_dependency 'rake', '~> 10.3'
s.add_development_dependency 'minitest', '~> 5.4'
s.add_development_dependency 'rdoc', '~> 4.1'
s.add_development_dependency 'ronn', '~> 0.7' unless RubyVersion.rbx? || RubyVersion.jruby?
s.add_development_dependency 'turn', '~> 0.9' unless RubyVersion.rbx?
end
2 changes: 1 addition & 1 deletion test/autoloading_test.rb
Expand Up @@ -2,7 +2,7 @@

module TestViews; end

class AutoloadingTest < Test::Unit::TestCase
class AutoloadingTest < Minitest::Test
def setup
Mustache.view_path = File.dirname(__FILE__) + '/fixtures'
end
Expand Down
2 changes: 1 addition & 1 deletion test/helper.rb
@@ -1,4 +1,4 @@
require 'test/unit'
require 'minitest/autorun'

Dir[File.dirname(__FILE__) + '/fixtures/*.rb'].each do |f|
require f
Expand Down
2 changes: 1 addition & 1 deletion test/mustache_test.rb
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
require_relative 'helper'

class MustacheTest < Test::Unit::TestCase
class MustacheTest < Minitest::Test
def test_instance_render
klass = Class.new(Mustache)
klass.template = "Hi {{thing}}!"
Expand Down
2 changes: 1 addition & 1 deletion test/parser_test.rb
@@ -1,6 +1,6 @@
require_relative 'helper'

class ParserTest < Test::Unit::TestCase
class ParserTest < Minitest::Test

def test_parser_extension
parser = Mustache::Parser.new
Expand Down
2 changes: 1 addition & 1 deletion test/partial_test.rb
@@ -1,6 +1,6 @@
require_relative 'helper'

class PartialTest < Test::Unit::TestCase
class PartialTest < Minitest::Test
def test_view_partial
assert_equal <<-end_partial.strip, PartialWithModule.render
<h1>Welcome</h1>
Expand Down
2 changes: 1 addition & 1 deletion test/spec_test.rb
Expand Up @@ -10,7 +10,7 @@
# Creates a partials directory, then points a (dynamic) subclass of Mustache at
# that directory before each test; the partials directory is destroyed after
# each test is run.
class MustacheSpec < Test::Unit::TestCase
class MustacheSpec < Minitest::Test
def setup
@partials = File.join(File.dirname(__FILE__), 'partials')
Dir.mkdir(@partials)
Expand Down
4 changes: 2 additions & 2 deletions test/template_test.rb
@@ -1,6 +1,6 @@
require_relative 'helper'

class TemplateTest < Test::Unit::TestCase
class TemplateTest < Minitest::Test
def test_compile
assert_equal %("foo"), Mustache::Template.new("foo").compile
end
Expand All @@ -18,7 +18,7 @@ def test_token_with_source
end
end

class TemplateTest2 < Test::Unit::TestCase
class TemplateTest2 < Minitest::Test
def setup
@@template_text ||= File.read(File.dirname(__FILE__) + "/fixtures/simply_complicated.mustache")
@template = Mustache::Template.new(@@template_text)
Expand Down

0 comments on commit 4e695ad

Please sign in to comment.