minitest 4.2.0 → 4.3.0

data/History.txt

@@ -1,3 +1,12 @@
+=== 4.3.0 / 2012-11-17
+
+* 4 minor enhancements:
+
+  * Allow #autorun to run even if loaded with other test libs that call exit. (sunaku)
+  * Do not include Expectations in Object if $MT_NO_EXPECTATIONS is set (experimental?)
+  * Gave some much needed love to assert_raises.
+  * Mock#expect can take a block to custom-validate args. (gmoothart)
+
 === 4.2.0 / 2012-11-02
 
 * 4 major enhancements:

data/README.txt

@@ -49,6 +49,17 @@ discovery.
 
     -- Piotr Szotkowski
 
+Comparing to rspec:
+
+    rspec is a testing DSL. minitest is ruby.
+
+    -- Adam Hawkins, "Bow Before MiniTest"
+
+minitest doesn't reinvent anything that ruby already provides, like:
+classes, modules, inheritance, methods. This means you only have to
+learn ruby to use minitest and all of your regular OO practices like
+extract-method refactorings still apply.
+
 == FEATURES/PROBLEMS:
 
 * minitest/autorun - the easy and explicit way to run all your tests.
@@ -264,43 +275,74 @@ fixture loading:
 
 == Known Extensions:
 
-minitest-capistrano    :: Assertions and expectations for testing Capistrano recipes
-minitest-capybara      :: Capybara matchers support for minitest unit and spec
-minitest-chef-handler  :: Run Minitest suites as Chef report handlers
-minitest-ci            :: CI reporter plugin for MiniTest.
-minitest-colorize      :: Colorize MiniTest output and show failing tests instantly.
-minitest-context       :: Defines contexts for code reuse in MiniTest
-                          specs that share common expectations.
-minitest-debugger      :: Wraps assert so failed assertions drop into
-                          the ruby debugger.
-minitest-display       :: Patches MiniTest to allow for an easily configurable output.
-minitest-emoji         :: Print out emoji for your test passes, fails, and skips.
-minitest-excludes      :: Clean API for excluding certain tests you
-                          don't want to run under certain conditions.
-minitest-firemock      :: Makes your MiniTest mocks more resilient.
-minitest-growl         :: Test notifier for minitest via growl.
-minitest-instrument    :: Instrument ActiveSupport::Notifications when
-                          test method is executed
-minitest-instrument-db :: Store information about speed of test
-                          execution provided by minitest-instrument in database
-minitest-libnotify     :: Test notifier for minitest via libnotify.
-minitest-macruby       :: Provides extensions to minitest for macruby UI testing.
-minitest-matchers      :: Adds support for RSpec-style matchers to minitest.
-minitest-metadata      :: Annotate tests with metadata (key-value).
-minitest-mongoid       :: Mongoid assertion matchers for MiniTest
-minitest-must_not      :: Provides must_not as an alias for wont in MiniTest
-minitest-predicates    :: Adds support for .predicate? methods
-minitest-pry           :: A minitest plugin to drop into pry on assertion failure.
-minitest-rails         :: MiniTest integration for Rails 3.1.
-minitest-reporters     :: Create customizable MiniTest output formats
-minitest-rg            :: redgreen minitest
-minitest-spec-magic    :: Minitest::Spec extensions for Rails and beyond
-minitest-tags          :: add tags for minitest
-minitest-wscolor       :: Yet another test colorizer.
-minitest_owrapper      :: Get tests results as a TestResult object.
-minitest_should        :: Shoulda style syntax for minitest test::unit.
-minitest_tu_shim       :: minitest_tu_shim bridges between test/unit and minitest.
-mongoid-minitest       :: MiniTest matchers for Mongoid.
+minitest-capistrano     :: Assertions and expectations for testing Capistrano recipes
+minitest-capybara       :: Capybara matchers support for minitest unit and spec
+minitest-chef-handler   :: Run Minitest suites as Chef report handlers
+minitest-ci             :: CI reporter plugin for MiniTest.
+minitest-colorize       :: Colorize MiniTest output and show failing tests instantly.
+minitest-context        :: Defines contexts for code reuse in MiniTest
+                           specs that share common expectations.
+minitest-debugger       :: Wraps assert so failed assertions drop into
+                           the ruby debugger.
+minitest-display        :: Patches MiniTest to allow for an easily configurable output.
+minitest-emoji          :: Print out emoji for your test passes, fails, and skips.
+minitest-excludes       :: Clean API for excluding certain tests you
+                           don't want to run under certain conditions.
+minitest-firemock       :: Makes your MiniTest mocks more resilient.
+minitest-growl          :: Test notifier for minitest via growl.
+minitest-instrument     :: Instrument ActiveSupport::Notifications when
+                           test method is executed
+minitest-instrument-db  :: Store information about speed of test
+                           execution provided by minitest-instrument in database
+minitest-libnotify      :: Test notifier for minitest via libnotify.
+minitest-macruby        :: Provides extensions to minitest for macruby UI testing.
+minitest-matchers       :: Adds support for RSpec-style matchers to minitest.
+minitest-metadata       :: Annotate tests with metadata (key-value).
+minitest-mongoid        :: Mongoid assertion matchers for MiniTest
+minitest-must_not       :: Provides must_not as an alias for wont in MiniTest
+minitest-predicates     :: Adds support for .predicate? methods
+minitest-rails          :: MiniTest integration for Rails 3.x
+minitest-rails-capybara :: Capybara integration for MiniTest::Rails
+minitest-reporters      :: Create customizable MiniTest output formats
+minitest-rg             :: redgreen minitest
+minitest-shouldify      :: Adding all manner of shoulds to MiniTest (bad idea)
+minitest-spec-magic     :: Minitest::Spec extensions for Rails and beyond
+minitest-tags           :: add tags for minitest
+minitest-wscolor        :: Yet another test colorizer.
+minitest_owrapper       :: Get tests results as a TestResult object.
+minitest_should         :: Shoulda style syntax for minitest test::unit.
+minitest_tu_shim        :: minitest_tu_shim bridges between test/unit and minitest.
+mongoid-minitest        :: MiniTest matchers for Mongoid.
+pry-rescue              :: A pry plugin w/ minitest support. See pry-rescue/minitest.rb.
+
+== Unknown Extensions:
+
+Authors... Please send me a pull request with a description of your minitest extension.
+
+* assay-minitest
+* capybara_minitest_spec
+* detroit-minitest
+* em-minitest-spec
+* flexmock-minitest
+* guard-minitest
+* guard-minitest-decisiv
+* minitest-activemodel
+* minitest-ar-assertions
+* minitest-around
+* minitest-capybara-unit
+* minitest-colorer
+* minitest-deluxe
+* minitest-extra-assertions
+* minitest-nc
+* minitest-rails-shoulda
+* minitest-spec
+* minitest-spec-context
+* minitest-spec-rails
+* minitest-spec-should
+* minitest-sugar
+* minitest_should
+* mongoid-minitest
+* spork-minitest
 
 == REQUIREMENTS:
 

data/lib/minitest/mock.rb

@@ -24,8 +24,8 @@ module MiniTest
     end
 
     ##
-    # Expect that method +name+ is called, optionally with +args+, and returns
-    # +retval+.
+    # Expect that method +name+ is called, optionally with +args+ or a
+    # +blk+, and returns +retval+.
     #
     #   @mock.expect(:meaning_of_life, 42)
     #   @mock.meaning_of_life # => 42
@@ -33,6 +33,10 @@ module MiniTest
     #   @mock.expect(:do_something_with, true, [some_obj, true])
     #   @mock.do_something_with(some_obj, true) # => true
     #
+    #   @mock.expect(:do_something_else, true) do |a1, a2|
+    #     a1 == "buggs" && a2 == :bunny
+    #   end
+    #
     # +args+ is compared to the expected args using case equality (ie, the
     # '===' operator), allowing for less specific expectations.
     #
@@ -44,9 +48,14 @@ module MiniTest
     #   @mock.uses_one_string("bar") # => true
     #   @mock.verify  # => raises MockExpectationError
 
-    def expect(name, retval, args=[])
-      raise ArgumentError, "args must be an array" unless Array === args
-      @expected_calls[name] << { :retval => retval, :args => args }
+    def expect(name, retval, args=[], &blk)
+      if block_given?
+        raise ArgumentError, "args ignored when block given" unless args.empty?
+        @expected_calls[name] << { :retval => retval, :block => blk }
+      else
+        raise ArgumentError, "args must be an array" unless Array === args
+        @expected_calls[name] << { :retval => retval, :args => args }
+      end
       self
     end
 
@@ -96,7 +105,17 @@ module MiniTest
           [sym, args]
       end
 
-      expected_args, retval = expected_call[:args], expected_call[:retval]
+      expected_args, retval, val_block =
+        expected_call.values_at(:args, :retval, :block)
+
+      if val_block then
+        raise MockExpectationError, "mocked method %p failed block w/ %p" %
+          [sym, args] unless val_block.call(args)
+
+        # keep "verify" happy
+        @actual_calls[sym] << expected_call
+        return retval
+      end
 
       if expected_args.size != args.size then
         raise ArgumentError, "mocked method %p expects %d arguments, got %d" %

data/lib/minitest/spec.rb

@@ -530,5 +530,5 @@ module MiniTest::Expectations
 end
 
 class Object # :nodoc:
-  include MiniTest::Expectations
+  include MiniTest::Expectations unless ENV["MT_NO_EXPECTATIONS"]
 end

data/lib/minitest/unit.rb

@@ -358,30 +358,30 @@ module MiniTest
     def assert_raises *exp
       msg = "#{exp.pop}.\n" if String === exp.last
 
-      should_raise = false
       begin
         yield
-        should_raise = true
       rescue MiniTest::Skip => e
-        details = "#{msg}#{mu_pp(exp)} exception expected, not"
-
-        if exp.include? MiniTest::Skip then
-          return e
-        else
-          raise e
-        end
+        return e if exp.include? MiniTest::Skip
+        raise e
       rescue Exception => e
-        details = "#{msg}#{mu_pp(exp)} exception expected, not"
-        assert(exp.any? { |ex|
-                 ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class
-               }, exception_details(e, details))
+        expected = exp.any? { |ex|
+          if ex.instance_of? Module then
+            e.kind_of? ex
+          else
+            e.instance_of? ex
+          end
+        }
+
+        assert expected, proc {
+          exception_details(e, "#{msg}#{mu_pp(exp)} exception expected, not")
+        }
 
         return e
       end
 
       exp = exp.first if exp.size == 1
-      flunk "#{msg}#{mu_pp(exp)} expected but nothing was raised." if
-        should_raise
+
+      flunk "#{msg}#{mu_pp(exp)} expected but nothing was raised."
     end
 
     ##
@@ -439,7 +439,7 @@ module MiniTest
         begin
           yield
         rescue ThreadError => e       # wtf?!? 1.8 + threads == suck
-          default += ", not :#{e.message[/uncaught throw \`(\w+?)\'/, 1]}"
+          default += ", not \:#{e.message[/uncaught throw \`(\w+?)\'/, 1]}"
         rescue ArgumentError => e     # 1.9 exception
           default += ", not #{e.message.split(/ /).last}"
         rescue NameError => e         # 1.8 exception
@@ -729,7 +729,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "4.2.0" # :nodoc:
+    VERSION = "4.3.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -764,7 +764,8 @@ module MiniTest
 
     def self.autorun
       at_exit {
-        next if $! # don't run if there was an exception
+        # don't run if there was a non-exit exception
+        next if $! and not $!.kind_of? SystemExit
 
         # the order here is important. The at_exit handler must be
         # installed before anyone else gets a chance to install their

data/test/minitest/test_minitest_mock.rb

@@ -198,6 +198,68 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     assert_equal exp, e.message
   end
 
+  def test_verify_passes_when_mock_block_returns_true
+    mock = MiniTest::Mock.new
+    mock.expect :foo, nil do
+      true
+    end
+
+    mock.foo
+
+    assert mock.verify
+  end
+
+  def test_mock_block_is_passed_function_params
+    arg1, arg2, arg3 = :bar, [1,2,3], {:a => 'a'}
+    mock = MiniTest::Mock.new
+    mock.expect :foo, nil do |a1, a2, a3|
+      a1 == arg1 &&
+      a2 == arg2 &&
+      a3 == arg3
+    end
+
+    mock.foo arg1, arg2, arg3
+
+    assert mock.verify
+  end
+
+  def test_verify_fails_when_mock_block_returns_false
+    mock = MiniTest::Mock.new
+    mock.expect :foo, nil do
+      false
+    end
+
+    e = assert_raises(MockExpectationError) { mock.foo }
+    exp = "mocked method :foo failed block w/ []"
+
+    assert_equal exp, e.message
+  end
+
+  def test_mock_block_throws_if_args_passed
+    mock = MiniTest::Mock.new
+
+    e = assert_raises(ArgumentError) do
+      mock.expect :foo, nil, [:a, :b, :c] do
+        true
+      end
+    end
+
+    exp = "args ignored when block given"
+
+    assert_equal exp, e.message
+  end
+
+  def test_mock_returns_retval_when_called_with_block
+    mock = MiniTest::Mock.new
+    mock.expect(:foo, 32) do
+      true
+    end
+
+    rs = mock.foo
+
+    assert_equal rs, 32
+  end
+
   def util_verify_bad exp
     e = assert_raises MockExpectationError do
       @mock.verify

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: 
   segments: 
   - 4
-  - 2
+  - 3
   - 0
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-11-02 00:00:00 Z
+date: 2012-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 1
         segments: 
         - 3
-        - 1
-        version: "3.1"
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id002
 description: |-
@@ -111,6 +111,17 @@ description: |-
        framework that I can actually read in full in one sitting!"
   
       -- Piotr Szotkowski
+  
+  Comparing to rspec:
+  
+      rspec is a testing DSL. minitest is ruby.
+  
+      -- Adam Hawkins, "Bow Before MiniTest"
+  
+  minitest doesn't reinvent anything that ruby already provides, like:
+  classes, modules, inheritance, methods. This means you only have to
+  learn ruby to use minitest and all of your regular OO practices like
+  extract-method refactorings still apply.
 email: 
 - ryand-ruby@zenspider.com
 executables: []