minitest 2.6.2 → 2.7.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.7.0 / 2011-10-25
+
+* 2 minor enhancements:
+
+  * Include failed values in the expected arg output in MockExpectationError. (nono)
+  * Make minitest/pride work with other 256 color capable terms. (sunaku)
+
+* 2 bug fixes:
+
+  * Clarified the documentation of minitest/benchmark (eregon)
+  * Fixed using expectations in regular unit tests. (sunaku)
+
 === 2.6.2 / 2011-10-19
 
 * 1 minor enhancement:

data/README.txt

@@ -129,9 +129,7 @@ benchmarks won't run.
     # Override self.bench_range or default range is [1, 10, 100, 1_000, 10_000]
     def bench_my_algorithm
       assert_performance_linear 0.9999 do |n| # n is a range value
-        n.times do
-          @obj.my_algorithm
-        end
+        @obj.my_algorithm(n)
       end
     end
   end

data/lib/minitest/benchmark.rb

@@ -77,8 +77,8 @@ class MiniTest::Unit
     #
     #   def bench_algorithm
     #     validation = proc { |x, y| ... }
-    #     assert_performance validation do |x|
-    #       @obj.algorithm
+    #     assert_performance validation do |n|
+    #       @obj.algorithm(n)
     #     end
     #   end
 
@@ -121,8 +121,8 @@ class MiniTest::Unit
     # Eg:
     #
     #   def bench_algorithm
-    #     assert_performance_constant 0.9999 do |x|
-    #       @obj.algorithm
+    #     assert_performance_constant 0.9999 do |n|
+    #       @obj.algorithm(n)
     #     end
     #   end
 
@@ -147,8 +147,8 @@ class MiniTest::Unit
     # Eg:
     #
     #   def bench_algorithm
-    #     assert_performance_exponential 0.9999 do |x|
-    #       @obj.algorithm
+    #     assert_performance_exponential 0.9999 do |n|
+    #       @obj.algorithm(n)
     #     end
     #   end
 
@@ -167,8 +167,8 @@ class MiniTest::Unit
     # Eg:
     #
     #   def bench_algorithm
-    #     assert_performance_linear 0.9999 do |x|
-    #       @obj.algorithm
+    #     assert_performance_linear 0.9999 do |n|
+    #       @obj.algorithm(n)
     #     end
     #   end
 
@@ -323,8 +323,8 @@ class MiniTest::Spec
   # Create a benchmark that verifies that the performance is linear.
   #
   #   describe "my class" do
-  #     bench_performance_linear "fast_algorithm", 0.9999 do
-  #       @obj.fast_algorithm
+  #     bench_performance_linear "fast_algorithm", 0.9999 do |n|
+  #       @obj.fast_algorithm(n)
   #     end
   #   end
 
@@ -338,8 +338,8 @@ class MiniTest::Spec
   # Create a benchmark that verifies that the performance is constant.
   #
   #   describe "my class" do
-  #     bench_performance_constant "zoom_algorithm!" do
-  #       @obj.zoom_algorithm!
+  #     bench_performance_constant "zoom_algorithm!" do |n|
+  #       @obj.zoom_algorithm!(n)
   #     end
   #   end
 
@@ -353,8 +353,8 @@ class MiniTest::Spec
   # Create a benchmark that verifies that the performance is exponential.
   #
   #   describe "my class" do
-  #     bench_performance_exponential "algorithm" do
-  #       @obj.algorithm
+  #     bench_performance_exponential "algorithm" do |n|
+  #       @obj.algorithm(n)
   #     end
   #   end
 

data/lib/minitest/mock.rb

@@ -86,7 +86,7 @@ module MiniTest
 
       @actual_calls[sym] << {
         :retval => retval,
-        :args => expected_args.zip(args).map { |mod, a| mod if mod === a }
+        :args => expected_args.zip(args).map { |mod, a| mod === a ? mod : a }
       }
 
       retval

data/lib/minitest/pride.rb

@@ -89,5 +89,5 @@ class PrideLOL < PrideIO # inspired by lolcat, but massively cleaned up
   end
 end
 
-klass = ENV['TERM'] =~ /^xterm(-256color)?$/ ? PrideLOL : PrideIO
+klass = ENV['TERM'] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
 MiniTest::Unit.output = klass.new(MiniTest::Unit.output)

data/lib/minitest/spec.rb

@@ -132,10 +132,6 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
     @@describe_stack
   end
 
-  def self.current # :nodoc:
-    @@current_spec
-  end
-
   ##
   # Returns the children of this spec.
 
@@ -143,11 +139,6 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
     @children ||= []
   end
 
-  def initialize name # :nodoc:
-    super
-    @@current_spec = self
-  end
-
   def self.nuke_test_methods! # :nodoc:
     self.public_instance_methods.grep(/^test_/).each do |name|
       self.send :undef_method, name

data/lib/minitest/unit.rb

@@ -645,7 +645,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "2.6.2" # :nodoc:
+    VERSION = "2.7.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -997,6 +997,11 @@ module MiniTest
         @__name__ = name
         @__io__ = nil
         @passed = nil
+        @@current = self
+      end
+
+      def self.current # :nodoc:
+        @@current
       end
 
       def io

data/test/test_minitest_mock.rb

@@ -141,6 +141,18 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     util_verify_bad
   end
 
+  def test_verify_shows_the_actual_arguments_in_the_message
+    mock = MiniTest::Mock.new
+    mock.expect :capitalized, true, ["Foobar"]
+    mock.capitalized "foobaz"
+    e = assert_raises MockExpectationError do
+      mock.verify
+    end
+
+    expected = "expected capitalized, {:retval=>true, :args=>[\"Foobar\"]}, got [{:retval=>true, :args=>[\"foobaz\"]}]"
+    assert_equal expected, e.message
+  end
+
   def util_verify_bad
     assert_raises MockExpectationError do
       @mock.verify

data/test/test_minitest_unit.rb

@@ -1,8 +1,6 @@
 require 'stringio'
 require 'pathname'
-require 'minitest/unit'
-
-MiniTest::Unit.autorun
+require 'minitest/autorun'
 
 module MyModule; end
 class AnError < StandardError; include MyModule; end
@@ -1204,6 +1202,18 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
     assert_equal [ATestCase], MiniTest::Unit::TestCase.test_suites
   end
 
+  def test_expectation
+    @assertion_count = 2
+
+    @tc.assert_equal true, 1.must_equal(1)
+  end
+
+  def test_expectation_triggered
+    util_assert_triggered "Expected: 2\n  Actual: 1" do
+      1.must_equal 2
+    end
+  end
+
   def test_flunk
     util_assert_triggered 'Epic Fail!' do
       @tc.flunk

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 2
-  - 6
-  - 2
-  version: 2.6.2
+  - 7
+  - 0
+  version: 2.7.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-10-19 00:00:00 Z
+date: 2011-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe