minitest 2.5.0 → 2.5.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.5.1 / 2011-08-27
+
+* 2 minor enhancements:
+
+  * Added gem activation for minitest in minitest/autoload to help out 1.9 users
+  * Extended Spec.register_spec_type to allow for procs instead of just regexps.
+
 === 2.5.0 / 2011-08-18
 
 * 4 minor enhancements:

data/lib/minitest/autorun.rb

@@ -1,3 +1,10 @@
+begin
+  require 'rubygems'
+  gem 'minitest'
+rescue Gem::LoadError
+  # do nothing
+end
+
 require 'minitest/unit'
 require 'minitest/spec'
 require 'minitest/mock'

data/lib/minitest/spec.rb

@@ -88,11 +88,27 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
   TYPES = [[//, MiniTest::Spec]]
 
   ##
-  # Register a new type of spec that matches the spec's description. Eg:
+  # Register a new type of spec that matches the spec's description.
+  # This method can take either a Regexp and a spec class or a spec
+  # class and a block that takes the description and returns true if
+  # it matches.
   #
-  #     register_spec_plugin(/Controller$/, MiniTest::Spec::Rails)
+  # Eg:
+  #
+  #     register_spec_type(/Controller$/, MiniTest::Spec::Rails)
+  #
+  # or:
+  #
+  #     register_spec_type(MiniTest::Spec::RailsModel) do |desc|
+  #       desc.superclass == ActiveRecord::Base
+  #     end
 
-  def self.register_spec_type matcher, klass
+  def self.register_spec_type(*args, &block)
+    if block then
+      matcher, klass = block, args.first
+    else
+      matcher, klass = *args
+    end
     TYPES.unshift [matcher, klass]
   end
 
@@ -102,8 +118,13 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
   #     spec_type("BlahController") # => MiniTest::Spec::Rails
 
   def self.spec_type desc
-    desc = desc.to_s
-    TYPES.find { |re, klass| re === desc }.last
+    TYPES.find { |matcher, klass|
+      if matcher.respond_to? :call then
+        matcher.call desc
+      else
+        matcher === desc.to_s
+      end
+    }.last
   end
 
   @@describe_stack = []

data/lib/minitest/unit.rb

@@ -614,7 +614,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "2.5.0" # :nodoc:
+    VERSION = "2.5.1" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:

data/test/test_minitest_spec.rb

@@ -1,6 +1,11 @@
 require 'minitest/autorun'
 require 'stringio'
 
+class MiniSpecA < MiniTest::Spec; end
+class MiniSpecB < MiniTest::Spec; end
+class ExampleA; end
+class ExampleB < ExampleA; end
+
 describe MiniTest::Spec do
   before do
     @assertion_count = 4
@@ -273,6 +278,38 @@ class TestMeta < MiniTest::Unit::TestCase
     return x, y, z, before_list, after_list
   end
 
+  def test_register_spec_type
+    original_types = MiniTest::Spec::TYPES.dup
+
+    assert_equal [[//, MiniTest::Spec]], MiniTest::Spec::TYPES
+
+    MiniTest::Spec.register_spec_type(/woot/, TestMeta)
+
+    p = lambda do |x| true end
+    MiniTest::Spec.register_spec_type TestMeta, &p
+
+    keys = MiniTest::Spec::TYPES.map(&:first)
+
+    assert_includes keys, /woot/
+    assert_includes keys, p
+  ensure
+    MiniTest::Spec::TYPES.replace original_types
+  end
+
+  def test_spec_type
+    original_types = MiniTest::Spec::TYPES.dup
+
+    MiniTest::Spec.register_spec_type(/A$/, MiniSpecA)
+    MiniTest::Spec.register_spec_type MiniSpecB do |desc|
+      desc.superclass == ExampleA
+    end
+
+    assert_equal MiniSpecA, MiniTest::Spec.spec_type(ExampleA)
+    assert_equal MiniSpecB, MiniTest::Spec.spec_type(ExampleB)
+  ensure
+    MiniTest::Spec::TYPES.replace original_types
+  end
+
   def test_structure
     x, y, z, * = util_structure
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -46,11 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 2
-        - 11
-        version: "2.11"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id001
 description: |-
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bfts
-rubygems_version: 1.8.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking