summaryrefslogtreecommitdiff
path: root/lib/minitest
diff options
context:
space:
mode:
authorryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-19 20:44:08 +0000
committerryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-19 20:44:08 +0000
commit4f00a27fb5028c7be9fd7c0c6bdebc689b4a703d (patch)
treeab026cce862acd3f97a0abe4b4c42595c38b5f56 /lib/minitest
parentdf52785d301a991332d0bff7b37bcee31133a7c0 (diff)
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 'lib/minitest')
-rw-r--r--lib/minitest/autorun.rb10
-rw-r--r--lib/minitest/benchmark.rb10
-rw-r--r--lib/minitest/mock.rb10
-rw-r--r--lib/minitest/pride.rb10
-rw-r--r--lib/minitest/spec.rb10
-rw-r--r--lib/minitest/unit.rb13
6 files changed, 32 insertions, 31 deletions
diff --git a/lib/minitest/autorun.rb b/lib/minitest/autorun.rb
index 5bf35f6ab8..3b6c2d49f1 100644
--- a/lib/minitest/autorun.rb
+++ b/lib/minitest/autorun.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/unit'
require 'minitest/spec'
diff --git a/lib/minitest/benchmark.rb b/lib/minitest/benchmark.rb
index f8dcee745e..83f62917ca 100644
--- a/lib/minitest/benchmark.rb
+++ b/lib/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/unit'
require 'minitest/spec'
diff --git a/lib/minitest/mock.rb b/lib/minitest/mock.rb
index adff7455a7..1cbf18b19f 100644
--- a/lib/minitest/mock.rb
+++ b/lib/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.
+######################################################################
class MockExpectationError < StandardError; end
diff --git a/lib/minitest/pride.rb b/lib/minitest/pride.rb
index 3cb4e1564c..9a4d68859a 100644
--- a/lib/minitest/pride.rb
+++ b/lib/minitest/pride.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/unit"
diff --git a/lib/minitest/spec.rb b/lib/minitest/spec.rb
index 8e2412e5ea..79f2102bca 100644
--- a/lib/minitest/spec.rb
+++ b/lib/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.
+######################################################################
#!/usr/bin/ruby -w
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
index 100d77f61a..e3a069a3e9 100644
--- a/lib/minitest/unit.rb
+++ b/lib/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 'optparse'
@@ -100,7 +100,8 @@ module MiniTest
# Fails unless the block returns a true value.
def assert_block msg = nil
- assert yield, "Expected block to return true value."
+ msg = message(msg) { "Expected block to return true value" }
+ assert yield, msg
end
##