minitest 2.7.0 → 2.8.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.8.0 / 2011-11-08
+
+* 2 minor enhancements:
+
+  * Add a  method so that code can be run around a particular test case (tenderlove)
+  * Turn off backtrace filtering if we're running inside a ruby checkout. (drbrain)
+
+* 2 bug fixes:
+
+  * Fixed 2 typos and 2 doc glitches. (splattael)
+  * Remove unused block arguments to avoid creating Proc objects. (k-tsj)
+
 === 2.7.0 / 2011-10-25
 
 * 2 minor enhancements:

data/lib/minitest/spec.rb

@@ -6,7 +6,7 @@ class Module # :nodoc:
   def infect_an_assertion meth, new_name, dont_flip = false # :nodoc:
     # warn "%-22p -> %p %p" % [meth, new_name, dont_flip]
     self.class_eval <<-EOM
-      def #{new_name} *args, &block
+      def #{new_name} *args
         return MiniTest::Spec.current.#{meth}(*args, &self) if
           Proc === self
         return MiniTest::Spec.current.#{meth}(args.first, self) if

data/lib/minitest/unit.rb

@@ -18,22 +18,6 @@ module MiniTest
 
   class Skip < Assertion; end
 
-  file = if RUBY_VERSION >= '1.9.0' then  # bt's expanded, but __FILE__ isn't :(
-           File.expand_path __FILE__
-         elsif  __FILE__ =~ /^[^\.]/ then # assume both relative
-           require 'pathname'
-           pwd = Pathname.new Dir.pwd
-           pn = Pathname.new File.expand_path(__FILE__)
-           relpath = pn.relative_path_from(pwd) rescue pn
-           pn = File.join ".", relpath unless pn.relative?
-           pn.to_s
-         else                             # assume both are expanded
-           __FILE__
-         end
-
-  # './lib' in project dir, or '/usr/local/blahblah' if installed
-  MINI_DIR = File.dirname(File.dirname(file)) # :nodoc:
-
   def self.filter_backtrace bt # :nodoc:
     return ["No backtrace"] unless bt
 
@@ -41,11 +25,11 @@ module MiniTest
 
     unless $DEBUG then
       bt.each do |line|
-        break if line.rindex MINI_DIR, 0
+        break if line =~ /lib\/minitest/
         new_bt << line
       end
 
-      new_bt = bt.reject { |line| line.rindex MINI_DIR, 0 } if new_bt.empty?
+      new_bt = bt.reject { |line| line =~ /lib\/minitest/ } if new_bt.empty?
       new_bt = bt.dup if new_bt.empty?
     else
       new_bt = bt.dup
@@ -645,7 +629,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "2.7.0" # :nodoc:
+    VERSION = "2.8.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -971,7 +955,7 @@ module MiniTest
           @passed = nil
           self.setup
           self.run_setup_hooks
-          self.__send__ self.__name__
+          self.run_test self.__name__
           result = "." unless io?
           @passed = true
         rescue *PASSTHROUGH_EXCEPTIONS
@@ -993,6 +977,8 @@ module MiniTest
         result
       end
 
+      alias :run_test :__send__
+
       def initialize name # :nodoc:
         @__name__ = name
         @__io__ = nil
@@ -1093,17 +1079,17 @@ module MiniTest
       # The argument can be any object that responds to #call or a block.
       # That means that this call,
       #
-      #     MiniTest::TestCase.add_setup_hook { puts "foo" }
+      #     MiniTest::Unit::TestCase.add_setup_hook { puts "foo" }
       #
       # ... is equivalent to:
       #
       #     module MyTestSetup
-      #       def call
+      #       def self.call
       #         puts "foo"
       #       end
       #     end
       #
-      #     MiniTest::TestCase.add_setup_hook MyTestSetup
+      #     MiniTest::Unit::TestCase.add_setup_hook MyTestSetup
       #
       # The blocks passed to +add_setup_hook+ take an optional parameter that
       # will be the TestCase instance that is executing the block.
@@ -1142,17 +1128,17 @@ module MiniTest
       # The argument can be any object that responds to #call or a block.
       # That means that this call,
       #
-      #     MiniTest::TestCase.add_teardown_hook { puts "foo" }
+      #     MiniTest::Unit::TestCase.add_teardown_hook { puts "foo" }
       #
       # ... is equivalent to:
       #
       #     module MyTestTeardown
-      #       def call
+      #       def self.call
       #         puts "foo"
       #       end
       #     end
       #
-      #     MiniTest::TestCase.add_teardown_hook MyTestTeardown
+      #     MiniTest::Unit::TestCase.add_teardown_hook MyTestTeardown
       #
       # The blocks passed to +add_teardown_hook+ take an optional parameter
       # that will be the TestCase instance that is executing the block.

data/test/test_minitest_mock.rb

@@ -143,13 +143,16 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
 
   def test_verify_shows_the_actual_arguments_in_the_message
     mock = MiniTest::Mock.new
-    mock.expect :capitalized, true, ["Foobar"]
-    mock.capitalized "foobaz"
+    mock.expect :capitalized, true, ["a"]
+    mock.capitalized "b"
     e = assert_raises MockExpectationError do
       mock.verify
     end
 
-    expected = "expected capitalized, {:retval=>true, :args=>[\"Foobar\"]}, got [{:retval=>true, :args=>[\"foobaz\"]}]"
+    a = {:retval=>true, :args=>["a"]}
+    b = {:retval=>true, :args=>["b"]}
+
+    expected = "expected capitalized, #{a.inspect}, got [#{b.inspect}]"
     assert_equal expected, e.message
   end
 

data/test/test_minitest_unit.rb

@@ -8,7 +8,7 @@ class ImmutableString < String; def inspect; super.freeze; end; end
 
 class TestMiniTestUnit < MiniTest::Unit::TestCase
   pwd = Pathname.new(File.expand_path(Dir.pwd))
-  basedir = Pathname.new(File.expand_path(MiniTest::MINI_DIR)) + 'mini'
+  basedir = Pathname.new(File.expand_path("lib/minitest")) + 'mini'
   basedir = basedir.relative_path_from(pwd).to_s
   MINITEST_BASE_DIR = basedir[/\A\./] ? basedir : "./#{basedir}"
   BT_MIDDLE = ["#{MINITEST_BASE_DIR}/test.rb:161:in `each'",
@@ -182,6 +182,38 @@ Finished tests in 0.00
     assert_equal ex, fu
   end
 
+  def test_run_test
+    tc = Class.new(MiniTest::Unit::TestCase) do
+      attr_reader :foo
+
+      def run_test name
+        @foo = "hi mom!"
+        super
+        @foo = "okay"
+      end
+
+      def test_something
+        assert_equal "hi mom!", foo
+      end
+    end
+
+    Object.const_set(:ATestCase, tc)
+
+    @tu.run %w[--seed 42]
+
+    expected = "Run options: --seed 42
+
+# Running tests:
+
+.
+
+Finished tests in 0.00
+
+1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
+"
+    assert_report expected
+  end
+
   def test_run_error
     tc = Class.new(MiniTest::Unit::TestCase) do
       def test_something

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 47
   prerelease: 
   segments: 
   - 2
-  - 7
+  - 8
   - 0
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,12 +36,27 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 9
+        version: "3.9"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -52,7 +67,7 @@ dependencies:
         - 12
         version: "2.12"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 description: "minitest provides a complete suite of testing facilities supporting\n\
   TDD, BDD, mocking, and benchmarking.\n\n    \"I had a class with Jim Weirich on testing last week and we were\n     allowed to choose our testing frameworks. Kirk Haines and I were\n     paired up and we cracked open the code for a few test\n     frameworks...\n\n     I MUST say that mintiest is *very* readable / understandable\n     compared to the 'other two' options we looked at. Nicely done and\n     thank you for helping us keep our mental sanity.\"\n\n    -- Wayne E. Seguin\n\n\
   minitest/unit is a small and incredibly fast unit testing framework.\n\