minitest 1.7.1 → 1.7.2

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.7.2 / 2010-09-23
+
+* 3 bug fixes:
+
+  * Fixed doco for expectations and Spec.
+  * Fixed test_capture_io on 1.9.3+ (sora_h)
+  * assert_raises now lets MiniTest::Skip through. (shyouhei)
+
 === 1.7.1 / 2010-09-01
 
 * 1 bug fix:

data/lib/minitest/spec.rb

@@ -3,7 +3,7 @@
 require 'minitest/unit'
 
 class Module
-  def infect_an_assertion meth, new_name, dont_flip = false
+  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
@@ -16,11 +16,17 @@ class Module
     EOM
   end
 
+  ##
+  # Create your own expectations from MiniTest::Assertions using a
+  # flexible set of rules. If you don't like must/wont, then this
+  # method is your friend. For an example of its usage see the bottom
+  # of minitest/spec.rb.
+
   def infect_with_assertions(pos_prefix, neg_prefix,
                              skip_re,
                              dont_flip_re = /\c0/,
                              map = {})
-    MiniTest::Assertions.public_instance_methods(false).each do |meth|
+    MiniTest::Assertions.public_instance_methods(false).sort.each do |meth|
       meth = meth.to_s
 
       new_name = case meth
@@ -35,28 +41,14 @@ class Module
       regexp, replacement = map.find { |re, _| new_name =~ re }
       new_name.sub! regexp, replacement if replacement
 
+      puts "\n##\n# :method: #{new_name}\n# See MiniTest::Assertions##{meth}" if
+        $0 == __FILE__
+
       infect_an_assertion meth, new_name, new_name =~ dont_flip_re
     end
   end
 end
 
-Object.infect_with_assertions(:must, :wont,
-                              /^(must|wont)$|wont_(throw)|
-                                 must_(block|not?_|nothing|raise$)/x,
-                              /(must|wont)_(include|respond_to)/,
-                              /(must_throw)s/                 => '\1',
-                              /(?!not)_same/                  => '_be_same_as',
-                              /_in_/                          => '_be_within_',
-                              /_operator/                     => '_be',
-                              /_includes/                     => '_include',
-                       /(must|wont)_(.*_of|nil|silent|empty)/ => '\1_be_\2',
-                              /must_raises/                   => 'must_raise')
-
-class Object
-  alias :must_be_close_to :must_be_within_delta
-  alias :wont_be_close_to :wont_be_within_delta
-end
-
 module Kernel
   ##
   # Describe a series of expectations for a given target +desc+.
@@ -91,6 +83,12 @@ class Module
   end
 end
 
+##
+# MiniTest::Spec -- The faster, better, less-magical spec framework!
+#
+# For a list of expectations, see Object.
+
+
 class MiniTest::Spec < MiniTest::Unit::TestCase
   @@describe_stack = [MiniTest::Spec]
   def self.describe_stack # :nodoc:
@@ -168,10 +166,36 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
       mod.send :undef_method, name if mod.respond_to? name
     end
   end
+end
+
+Object.infect_with_assertions(:must, :wont,
+                              /^(must|wont)$|wont_(throw)|
+                                 must_(block|not?_|nothing|raise$)/x,
+                              /(must|wont)_(include|respond_to)/,
+                              /(must_throw)s/                 => '\1',
+                              /(?!not)_same/                  => '_be_same_as',
+                              /_in_/                          => '_be_within_',
+                              /_operator/                     => '_be',
+                              /_includes/                     => '_include',
+                       /(must|wont)_(.*_of|nil|silent|empty)/ => '\1_be_\2',
+                              /must_raises/                   => 'must_raise')
+
+class Object
+  alias :must_be_close_to :must_be_within_delta
+  alias :wont_be_close_to :wont_be_within_delta
+
+  if $0 == __FILE__ then
+    { "must" => "assert", "wont" => "refute" }.each do |a, b|
+      puts "\n"
+      puts "##"
+      puts "# :method: #{a}_be_close_to"
+      puts "# See MiniTest::Assertions##{b}_in_delta"
+    end
+  end
 
   ##
   # :method: must_be
-  # See MiniTest::Assertions#assert
+  # See MiniTest::Assertions#assert_operator
 
   ##
   # :method: must_be_close_to
@@ -239,11 +263,11 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
 
   ##
   # :method: must_throw
-  # See MiniTest::Assertions#assert_throw
+  # See MiniTest::Assertions#assert_throws
 
   ##
   # :method: wont_be
-  # See MiniTest::Assertions#refute
+  # See MiniTest::Assertions#refute_operator
 
   ##
   # :method: wont_be_close_to
@@ -273,10 +297,6 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
   # :method: wont_be_within_delta
   # See MiniTest::Assertions#refute_in_delta
 
-  ##
-  # :method: wont_be_within_delta
-  # See MiniTest::Assertions#refute_in_delta
-
   ##
   # :method: wont_be_within_epsilon
   # See MiniTest::Assertions#refute_in_epsilon

data/lib/minitest/unit.rb

@@ -216,6 +216,14 @@ module MiniTest
       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
       rescue Exception => e
         details = "#{msg}#{mu_pp(exp)} exception expected, not"
         assert(exp.any? { |ex|
@@ -255,6 +263,7 @@ module MiniTest
     # +send_ary+ is a receiver, message and arguments.
     #
     # Fails unless the call returns a true value
+    # TODO: I should prolly remove this from specs
 
     def assert_send send_ary, m = nil
       recv, msg, *args = send_ary
@@ -497,7 +506,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "1.7.1" # :nodoc:
+    VERSION = "1.7.2" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:

data/test/test_mini_test.rb

@@ -636,6 +636,26 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
     end
   end
 
+  ##
+  # *sigh* This is quite an odd scenario, but it is from real (albeit
+  # ugly) test code in ruby-core:
+  #
+  # http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29259
+
+  def test_assert_raises_skip
+    @assertion_count = 0
+
+    util_assert_triggered "skipped", MiniTest::Skip do
+      @tc.assert_raises ArgumentError do
+        begin
+          raise "blah"
+        rescue
+          skip "skipped"
+        end
+      end
+    end
+  end
+
   def test_assert_raises_module
     @tc.assert_raises M do
       raise E
@@ -822,6 +842,8 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
   def test_capture_io
     @assertion_count = 0
 
+    orig_verbose = $VERBOSE
+    $VERBOSE = false
     out, err = capture_io do
       puts 'hi'
       warn 'bye!'
@@ -829,6 +851,8 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
 
     assert_equal "hi\n", out
     assert_equal "bye!\n", err
+  ensure
+    $VERBOSE = orig_verbose
   end
 
   def test_class_asserts_match_refutes

metadata

@@ -1,53 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
-  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
-  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
-  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
-  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
-  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
-  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
-  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
-  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -59,32 +35,28 @@ dependencies:
   name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
-        - 7
+        - 6
         - 0
-        version: 1.7.0
+        version: 1.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 description: |-
@@ -133,27 +105,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: bfts
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: minitest/unit is a small and fast replacement for ruby's huge and slow test/unit

metadata.gz.sig

@@ -1,2 +0,0 @@
-^!�6$<������g��Υ� ��{D	��gS�貪-ɏES����
-��@�z�g��*��Ÿ�JJ��6nO�Ik��HV��ř��sFy��k�-��_�SF�P���>S���S`]yݭ."�C;MB�oB�W��4�#��ej�6r��p�z�фW2�X����A�?��YGq&^�w�����@�����ƕ~/Z�r��T��B0B3n�zQMGŌ�̛3�����eͳ����8;4���G���#�E;��