diff options
author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-19 20:44:08 +0000 |
---|---|---|
committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-19 20:44:08 +0000 |
commit | 4f00a27fb5028c7be9fd7c0c6bdebc689b4a703d (patch) | |
tree | ab026cce862acd3f97a0abe4b4c42595c38b5f56 /test/minitest | |
parent | df52785d301a991332d0bff7b37bcee31133a7c0 (diff) | |
download | ruby-4f00a27fb5028c7be9fd7c0c6bdebc689b4a703d.tar.gz |
lib/minitest/*.rb: Imported minitest 2.0.2 r6207
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/minitest')
-rw-r--r-- | test/minitest/test_minitest_benchmark.rb | 10 | ||||
-rw-r--r-- | test/minitest/test_minitest_mock.rb | 10 | ||||
-rw-r--r-- | test/minitest/test_minitest_spec.rb | 10 | ||||
-rw-r--r-- | test/minitest/test_minitest_unit.rb | 14 |
4 files changed, 22 insertions, 22 deletions
diff --git a/test/minitest/test_minitest_benchmark.rb b/test/minitest/test_minitest_benchmark.rb index 089d0b3ce0..47f55232e6 100644 --- a/test/minitest/test_minitest_benchmark.rb +++ b/test/minitest/test_minitest_benchmark.rb @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/autorun' require 'minitest/benchmark' diff --git a/test/minitest/test_minitest_mock.rb b/test/minitest/test_minitest_mock.rb index bb4279c7d1..311f5fa7fb 100644 --- a/test/minitest/test_minitest_mock.rb +++ b/test/minitest/test_minitest_mock.rb @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/mock' require 'minitest/unit' diff --git a/test/minitest/test_minitest_spec.rb b/test/minitest/test_minitest_spec.rb index 733ce0f5c7..b0a6474a71 100644 --- a/test/minitest/test_minitest_spec.rb +++ b/test/minitest/test_minitest_spec.rb @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/spec' diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb index a8187f2275..eaf1aa475e 100644 --- a/test/minitest/test_minitest_unit.rb +++ b/test/minitest/test_minitest_unit.rb @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'stringio' require 'pathname' @@ -409,8 +409,8 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase end def test_assert_block_triggered - util_assert_triggered 'Expected block to return true value.' do - @tc.assert_block do + util_assert_triggered "blah.\nExpected block to return true value." do + @tc.assert_block "blah" do false end end |