parent
5e6734e3cd
commit
fe9c28df84
@ -1 +1,3 @@
|
||||
/test_declarative-0.0.5.gem
|
||||
/test_declarative-0.0.6-test.tar.gz
|
||||
/test_declarative-0.0.6.gem
|
||||
|
@ -1,81 +0,0 @@
|
||||
From e05fcfffb7ccafcae89674460b2b46dd87b62b7b Mon Sep 17 00:00:00 2001
|
||||
From: Josef Stribny <jstribny@redhat.com>
|
||||
Date: Mon, 19 Jan 2015 18:28:42 +0100
|
||||
Subject: [PATCH] Add support for Minitest >=5
|
||||
|
||||
- add Minitest 5 support
|
||||
- change tests to work with both test/unit (if available) and Minitest 5
|
||||
- fix the test suite on Ruby 1.8.7 by explicitely requiring test/unit/testresult
|
||||
---
|
||||
lib/test_declarative.rb | 1 +
|
||||
test/test_declarative_test.rb | 37 ++++++++++++++++++++++++++++++++-----
|
||||
test_declarative.gemspec | 1 +
|
||||
3 files changed, 34 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/test_declarative.rb b/lib/test_declarative.rb
|
||||
index 34ae02b..aae5f74 100644
|
||||
--- a/lib/test_declarative.rb
|
||||
+++ b/lib/test_declarative.rb
|
||||
@@ -1,6 +1,7 @@
|
||||
targets = [Module]
|
||||
targets << Test::Unit::TestCase if defined?(Test::Unit::TestCase)
|
||||
targets << MiniTest::Unit::TestCase if defined?(MiniTest::Unit::TestCase)
|
||||
+targets << Minitest::Test if defined?(Minitest::Test)
|
||||
|
||||
targets.each do |target|
|
||||
target.class_eval do
|
||||
diff --git a/test/test_declarative_test.rb b/test/test_declarative_test.rb
|
||||
index abc1278..c18ff6e 100644
|
||||
--- a/test/test_declarative_test.rb
|
||||
+++ b/test/test_declarative_test.rb
|
||||
@@ -1,17 +1,44 @@
|
||||
$: << File.expand_path('../../lib', __FILE__)
|
||||
|
||||
-require 'test/unit'
|
||||
+# Test with test/unit for older Rubies
|
||||
+begin
|
||||
+ require 'test/unit'
|
||||
+ require 'test/unit/testresult'
|
||||
+ if RUBY_VERSION < '1.9.1'
|
||||
+ # test/unit
|
||||
+ TEST_CASE = Test::Unit::TestCase
|
||||
+ RUNNER = Test::Unit::TestResult
|
||||
+ MINITEST_5 = false
|
||||
+ else
|
||||
+ # Minitest < 5
|
||||
+ TEST_CASE = Test::Unit::TestCase
|
||||
+ RUNNER = MiniTest::Unit
|
||||
+ MINITEST_5 = false
|
||||
+ end
|
||||
+rescue LoadError
|
||||
+ # Minitest >= 5
|
||||
+ require 'minitest/autorun'
|
||||
+ TEST_CASE = Minitest::Test
|
||||
+ RUNNER = Minitest::Unit
|
||||
+ MINITEST_5 = true
|
||||
+end
|
||||
+
|
||||
require 'test_declarative'
|
||||
|
||||
-class TestDeclarativeTest < Test::Unit::TestCase
|
||||
+class TestDeclarativeTest < TEST_CASE
|
||||
def test_responds_to_test
|
||||
assert self.class.respond_to?(:test)
|
||||
end
|
||||
|
||||
def test_adds_a_test_method
|
||||
called = false
|
||||
- assert_nothing_raised { Test::Unit::TestCase.test('some test') { called = true } }
|
||||
- Test::Unit::TestCase.new(:'test_some_test').run((RUBY_VERSION < '1.9.1' ? Test::Unit::TestResult : MiniTest::Unit).new) {}
|
||||
+ TEST_CASE.test('some test') { called = true }
|
||||
+ case MINITEST_5
|
||||
+ when false
|
||||
+ TEST_CASE.new(:'test_some_test').run(RUNNER.new) {}
|
||||
+ when true
|
||||
+ TEST_CASE.new(:'test_some_test').run() {}
|
||||
+ end
|
||||
assert called
|
||||
end
|
||||
-end
|
||||
\ No newline at end of file
|
||||
+end
|
@ -1 +1,2 @@
|
||||
994da4bb1425c8cb72c7effeeacd5abc test_declarative-0.0.5.gem
|
||||
SHA512 (test_declarative-0.0.6-test.tar.gz) = a9d9483bccc68bc394844a4bcf39b424533f923adeb58c6aad87c2f16963dd5941f8f356b7caa85e2d751cafee06b4c869f3eaa860a065143bca3487afa70a1c
|
||||
SHA512 (test_declarative-0.0.6.gem) = 715fd3b4adf121c7bc1c5cc291e388dbf4fb3da64a05d476a333c9308724ef02c1eb213c69808a6e9ce76615d7cf7d34edbc8bcd1525b0718a1d4ee71c5f123a
|
||||
|
Loading…
Reference in new issue