minitest 4.7.1 → 4.7.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 4.7.2 / 2013-04-18
+
+* 2 bug fixes:
+
+  * Fixed inconsistency in refute_in_delta/epsilon. I double negatived my logic. (nettsundere)
+  * Fixed stubbing of module methods (eg Kernel#sleep). (steveklabnik)
+
 === 4.7.1 / 2013-04-09
 
 * 1 minor enhancement:

data/README.txt

@@ -347,6 +347,7 @@ 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-english            :: Semantically symmetric aliases for assertions and expectations.
 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.
@@ -370,6 +371,7 @@ minitest-rails-capybara     :: Capybara integration for MiniTest::Rails
 minitest-reporters          :: Create customizable MiniTest output formats
 minitest-should_syntax      :: RSpec-style +x.should == y+ assertions for MiniTest
 minitest-shouldify          :: Adding all manner of shoulds to MiniTest (bad idea)
+minitest-spec-context       :: Provides rspec-ish context method to MiniTest::Spec
 minitest-spec-magic         :: Minitest::Spec extensions for Rails and beyond
 minitest-spec-rails         :: Drop in MiniTest::Spec superclass for ActiveSupport::TestCase.
 minitest-stub-const         :: Stub constants for the duration of a block
@@ -399,7 +401,6 @@ Authors... Please send me a pull request with a description of your minitest ext
 * minitest-extra-assertions
 * minitest-rails-shoulda
 * minitest-spec
-* minitest-spec-context
 * minitest-spec-should
 * minitest-sugar
 * minitest_should

data/lib/minitest/hell.rb

@@ -1,11 +1,13 @@
 require "minitest/parallel_each"
 
-class Minitest::Unit::TestCase # :nodoc:
+# :stopdoc:
+class Minitest::Unit::TestCase
   class << self
     alias :old_test_order :test_order
 
-    def test_order # :nodoc:
+    def test_order
       :parallel
     end
   end
 end
+# :startdoc:

data/lib/minitest/mock.rb

@@ -166,7 +166,7 @@ class Object # :nodoc:
   def stub name, val_or_callable, &block
     new_name = "__minitest_stub__#{name}"
 
-    metaclass = class << self; self; end
+    metaclass = self.class == Module ? self : class << self; self; end
 
     if respond_to? name and not methods.map(&:to_s).include? name.to_s then
       metaclass.send :define_method, name do |*args|

data/lib/minitest/spec.rb

@@ -258,7 +258,7 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
 
   extend DSL
 
-  TYPES = DSL::TYPES
+  TYPES = DSL::TYPES # :nodoc:
 end
 
 ##

data/lib/minitest/unit.rb

@@ -231,7 +231,9 @@ module MiniTest
 
     def assert_in_delta exp, act, delta = 0.001, msg = nil
       n = (exp - act).abs
-      msg = message(msg) { "Expected |#{exp} - #{act}| (#{n}) to be < #{delta}"}
+      msg = message(msg) {
+        "Expected |#{exp} - #{act}| (#{n}) to be <= #{delta}"
+      }
       assert delta >= n, msg
     end
 
@@ -595,9 +597,9 @@ module MiniTest
     def refute_in_delta exp, act, delta = 0.001, msg = nil
       n = (exp - act).abs
       msg = message(msg) {
-        "Expected |#{exp} - #{act}| (#{n}) to not be < #{delta}"
+        "Expected |#{exp} - #{act}| (#{n}) to not be <= #{delta}"
       }
-      refute delta > n, msg
+      refute delta >= n, msg
     end
 
     ##
@@ -711,6 +713,9 @@ module MiniTest
       raise MiniTest::Skip, msg, bt
     end
 
+    ##
+    # Was this testcase skipped? Meant for #teardown.
+
     def skipped?
       defined?(@skip) and @skip
     end
@@ -726,7 +731,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "4.7.1" # :nodoc:
+    VERSION = "4.7.2" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :assertion_count                    # :nodoc:

data/test/minitest/test_minitest_mock.rb

@@ -300,6 +300,18 @@ class TestMiniTestStub < MiniTest::Unit::TestCase
     end
   end
 
+  def test_stub_module
+    @assertion_count += 1
+
+    t0 = Time.now
+
+    Kernel.stub :sleep, nil do
+      @tc.assert_nil sleep(10)
+    end
+
+    @tc.assert_operator Time.now - t0, :<=, 1
+  end
+
   def test_stub_value
     assert_stub 42
   end

data/test/minitest/test_minitest_spec.rb

@@ -199,16 +199,16 @@ describe MiniTest::Spec do
 
     24.wont_be_close_to(42).must_equal false
 
-    assert_triggered "Expected |42 - 42.0| (0.0) to not be < 0.001." do
+    assert_triggered "Expected |42 - 42.0| (0.0) to not be <= 0.001." do
       (6 * 7.0).wont_be_close_to 42
     end
 
     x = maglev? ? "1.0000000000000001e-05" : "1.0e-05"
-    assert_triggered "Expected |42 - 42.0| (0.0) to not be < #{x}." do
+    assert_triggered "Expected |42 - 42.0| (0.0) to not be <= #{x}." do
       (6 * 7.0).wont_be_close_to 42, 0.00001
     end
 
-    assert_triggered "msg.\nExpected |42 - 42.0| (0.0) to not be < #{x}." do
+    assert_triggered "msg.\nExpected |42 - 42.0| (0.0) to not be <= #{x}." do
       (6 * 7.0).wont_be_close_to 42, 0.00001, "msg"
     end
   end
@@ -219,16 +219,16 @@ describe MiniTest::Spec do
     24.wont_be_within_epsilon(42).must_equal false
 
     x = maglev? ? "0.042000000000000003" : "0.042"
-    assert_triggered "Expected |42 - 42.0| (0.0) to not be < #{x}." do
+    assert_triggered "Expected |42 - 42.0| (0.0) to not be <= #{x}." do
       (6 * 7.0).wont_be_within_epsilon 42
     end
 
     x = maglev? ? "0.00042000000000000002" : "0.00042"
-    assert_triggered "Expected |42 - 42.0| (0.0) to not be < #{x}." do
+    assert_triggered "Expected |42 - 42.0| (0.0) to not be <= #{x}." do
       (6 * 7.0).wont_be_within_epsilon 42, 0.00001
     end
 
-    assert_triggered "msg.\nExpected |42 - 42.0| (0.0) to not be < #{x}." do
+    assert_triggered "msg.\nExpected |42 - 42.0| (0.0) to not be <= #{x}." do
       (6 * 7.0).wont_be_within_epsilon 42, 0.00001, "msg"
     end
   end
@@ -238,16 +238,16 @@ describe MiniTest::Spec do
 
     (6.0 * 7).must_be_close_to(42.0).must_equal true
 
-    assert_triggered "Expected |0.0 - 0.01| (0.01) to be < 0.001." do
+    assert_triggered "Expected |0.0 - 0.01| (0.01) to be <= 0.001." do
       (1.0 / 100).must_be_close_to 0.0
     end
 
     x = maglev? ? "9.9999999999999995e-07" : "1.0e-06"
-    assert_triggered "Expected |0.0 - 0.001| (0.001) to be < #{x}." do
+    assert_triggered "Expected |0.0 - 0.001| (0.001) to be <= #{x}." do
       (1.0 / 1000).must_be_close_to 0.0, 0.000001
     end
 
-    assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be < #{x}." do
+    assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be <= #{x}." do
       (1.0 / 1000).must_be_close_to 0.0, 0.000001, "msg"
     end
   end
@@ -257,15 +257,15 @@ describe MiniTest::Spec do
 
     (6.0 * 7).must_be_within_epsilon(42.0).must_equal true
 
-    assert_triggered "Expected |0.0 - 0.01| (0.01) to be < 0.0." do
+    assert_triggered "Expected |0.0 - 0.01| (0.01) to be <= 0.0." do
       (1.0 / 100).must_be_within_epsilon 0.0
     end
 
-    assert_triggered "Expected |0.0 - 0.001| (0.001) to be < 0.0." do
+    assert_triggered "Expected |0.0 - 0.001| (0.001) to be <= 0.0." do
       (1.0 / 1000).must_be_within_epsilon 0.0, 0.000001
     end
 
-    assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be < 0.0." do
+    assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be <= 0.0." do
       (1.0 / 1000).must_be_within_epsilon 0.0, 0.000001, "msg"
     end
   end

data/test/minitest/test_minitest_unit.rb

@@ -921,9 +921,17 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     @tc.assert_in_delta 0.0, 1.0 / 1000, 0.1
   end
 
+  def test_delta_consistency
+    @tc.assert_in_delta 0, 1, 1
+
+    util_assert_triggered "Expected |0 - 1| (1) to not be <= 1." do
+      @tc.refute_in_delta 0, 1, 1
+    end
+  end
+
   def test_assert_in_delta_triggered
-    x = maglev? ? "9.9999999999999995e-07" : "1.0e-06"
-    util_assert_triggered "Expected |0.0 - 0.001| (0.001) to be < #{x}." do
+    x = maglev? ? "9.999999xxxe-07" : "1.0e-06"
+    util_assert_triggered "Expected |0.0 - 0.001| (0.001) to be <= #{x}." do
       @tc.assert_in_delta 0.0, 1.0 / 1000, 0.000001
     end
   end
@@ -945,16 +953,25 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     @tc.assert_in_epsilon(-10000, -9991)
   end
 
+  def test_epsilon_consistency
+    @tc.assert_in_epsilon 1.0, 1.001
+
+    msg = "Expected |1.0 - 1.001| (0.000999xxx) to not be <= 0.001."
+    util_assert_triggered msg do
+      @tc.refute_in_epsilon 1.0, 1.001
+    end
+  end
+
   def test_assert_in_epsilon_triggered
-    util_assert_triggered 'Expected |10000 - 9990| (10) to be < 9.99.' do
+    util_assert_triggered 'Expected |10000 - 9990| (10) to be <= 9.99.' do
       @tc.assert_in_epsilon 10000, 9990
     end
   end
 
   def test_assert_in_epsilon_triggered_negative_case
-    x = (RUBY18 and not maglev?) ? "0.1" : "0.10000000000000009"
-    y = maglev? ? "0.10000000000000001" : "0.1"
-    util_assert_triggered "Expected |-1.1 - -1| (#{x}) to be < #{y}." do
+    x = (RUBY18 and not maglev?) ? "0.1" : "0.100000xxx"
+    y = maglev? ? "0.100000xxx" : "0.1"
+    util_assert_triggered "Expected |-1.1 - -1| (#{x}) to be <= #{y}." do
       @tc.assert_in_epsilon(-1.1, -1, 0.1)
     end
   end
@@ -1500,19 +1517,19 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
   end
 
   def test_refute_in_delta_triggered
-    x = maglev? ? "0.10000000000000001" : "0.1"
-    util_assert_triggered "Expected |0.0 - 0.001| (0.001) to not be < #{x}." do
+    x = maglev? ? "0.100000xxx" : "0.1"
+    util_assert_triggered "Expected |0.0 - 0.001| (0.001) to not be <= #{x}." do
       @tc.refute_in_delta 0.0, 1.0 / 1000, 0.1
     end
   end
 
   def test_refute_in_epsilon
-    @tc.refute_in_epsilon 10000, 9990
+    @tc.refute_in_epsilon 10000, 9990-1
   end
 
   def test_refute_in_epsilon_triggered
-    util_assert_triggered 'Expected |10000 - 9991| (9) to not be < 10.0.' do
-      @tc.refute_in_epsilon 10000, 9991
+    util_assert_triggered 'Expected |10000 - 9990| (10) to not be <= 10.0.' do
+      @tc.refute_in_epsilon 10000, 9990
       fail
     end
   end
@@ -1711,6 +1728,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
 
     msg = e.message.sub(/(---Backtrace---).*/m, '\1')
     msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
+    msg.gsub!(/(\d\.\d{6})\d+/, '\1xxx') # normalize: ruby version, impl, platform
 
     assert_equal expected, msg
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 4
   - 7
-  - 1
-  version: 4.7.1
+  - 2
+  version: 4.7.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-04-10 00:00:00 Z
+date: 2013-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
-        - 5
-        version: "3.5"
+        - 6
+        version: "3.6"
   type: :development
   version_requirements: *id002
 description: |-