minitest 4.6.2 → 4.7.0

data/History.txt

@@ -1,3 +1,13 @@
+=== 4.7.0 / 2013-03-18
+
+* 1 major enhancement:
+
+  * Refactored MiniTest::Spec into MiniTest::Spec::DSL.
+
+* 1 bug fix:
+
+  * Removed $DEBUG handler that detected when test/unit and minitest were both loaded. (tenderlove)
+
 === 4.6.2 / 2013-02-27
 
 * 1 minor enhancement:

data/README.txt

@@ -104,7 +104,7 @@ Given that you'd like to test the following class:
     def test_that_it_will_not_blend
       refute_match /^no/i, @meme.will_it_blend?
     end
-    
+
     def test_that_will_be_skipped
       skip "test this later"
     end
@@ -283,55 +283,55 @@ fixture loading:
 
 == Known Extensions:
 
-capybara_minitest_spec  :: Bridge between Capybara RSpec matchers and MiniTest::Spec expectations (e.g. page.must_have_content('Title')).
-minispec-metadata       :: Metadata for describe/it blocks
-                           (e.g. `it 'requires JS driver', js: true do`)
-minitest-ansi           :: Colorize minitest output with ANSI colors.
-minitest-around         :: Around block for minitest. An alternative to setup/teardown dance.
-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.
+capybara_minitest_spec      :: Bridge between Capybara RSpec matchers and MiniTest::Spec expectations (e.g. page.must_have_content('Title')).
+minispec-metadata           :: Metadata for describe/it blocks
+                               (e.g. `it 'requires JS driver', js: true do`)
+minitest-ansi               :: Colorize minitest output with ANSI colors.
+minitest-around             :: Around block for minitest. An alternative to setup/teardown dance.
+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-great_expectations :: Generally useful additions to minitest's assertions and expectations
-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-nc             :: Test notifier for minitest via Mountain Lion's Notification Center
-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-should_syntax  :: RSpec-style +x.should == y+ assertions for MiniTest
-minitest-shouldify      :: Adding all manner of shoulds to MiniTest (bad idea)
-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
-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.
+minitest-growl              :: Test notifier for minitest via growl.
+minitest-implicit-subject   :: Implicit declaration of the test subject.
+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-nc                 :: Test notifier for minitest via Mountain Lion's Notification Center
+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-should_syntax      :: RSpec-style +x.should == y+ assertions for MiniTest
+minitest-shouldify          :: Adding all manner of shoulds to MiniTest (bad idea)
+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
+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:
 
@@ -372,7 +372,7 @@ the gem, but you'll need to activate the gem explicitly to use it:
   require 'rubygems'
   gem 'minitest' # ensures you're using the gem, and not the built in MT
   require 'minitest/autorun'
-  
+
   # ... usual testing stuffs ...
 
 DO NOTE: There is a serious problem with the way that ruby 1.9/2.0

data/lib/minitest/spec.rb

@@ -59,7 +59,7 @@ module Kernel # :nodoc:
   def describe desc, additional_desc = nil, &block # :doc:
     stack = MiniTest::Spec.describe_stack
     name  = [stack.last, desc, additional_desc].compact.join("::")
-    sclas = stack.last || if Class === self && self < MiniTest::Spec then
+    sclas = stack.last || if Class === self && is_a?(MiniTest::Spec::DSL) then
                             self
                           else
                             MiniTest::Spec.spec_type desc
@@ -81,173 +81,184 @@ end
 # For a list of expectations, see MiniTest::Expectations.
 
 class MiniTest::Spec < MiniTest::Unit::TestCase
-  ##
-  # Contains pairs of matchers and Spec classes to be used to
-  # calculate the superclass of a top-level describe. This allows for
-  # automatically customizable spec types.
-  #
-  # See: register_spec_type and spec_type
-
-  TYPES = [[//, MiniTest::Spec]]
-
-  ##
-  # 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.
-  #
-  # 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(*args, &block)
-    if block then
-      matcher, klass = block, args.first
-    else
-      matcher, klass = *args
-    end
-    TYPES.unshift [matcher, klass]
-  end
 
   ##
-  # Figure out the spec class to use based on a spec's description. Eg:
-  #
-  #     spec_type("BlahController") # => MiniTest::Spec::Rails
-
-  def self.spec_type desc
-    TYPES.find { |matcher, klass|
-      if matcher.respond_to? :call then
-        matcher.call desc
+  # Oh look! A MiniTest::Spec::DSL module! Eat your heart out DHH.
+
+  module DSL
+    ##
+    # Contains pairs of matchers and Spec classes to be used to
+    # calculate the superclass of a top-level describe. This allows for
+    # automatically customizable spec types.
+    #
+    # See: register_spec_type and spec_type
+
+    TYPES = [[//, MiniTest::Spec]]
+
+    ##
+    # 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.
+    #
+    # Eg:
+    #
+    #     register_spec_type(/Controller$/, MiniTest::Spec::Rails)
+    #
+    # or:
+    #
+    #     register_spec_type(MiniTest::Spec::RailsModel) do |desc|
+    #       desc.superclass == ActiveRecord::Base
+    #     end
+
+    def register_spec_type(*args, &block)
+      if block then
+        matcher, klass = block, args.first
       else
-        matcher === desc.to_s
+        matcher, klass = *args
       end
-    }.last
-  end
-
-  @@describe_stack = []
-  def self.describe_stack # :nodoc:
-    @@describe_stack
-  end
+      TYPES.unshift [matcher, klass]
+    end
 
-  ##
-  # Returns the children of this spec.
+    ##
+    # Figure out the spec class to use based on a spec's description. Eg:
+    #
+    #     spec_type("BlahController") # => MiniTest::Spec::Rails
 
-  def self.children
-    @children ||= []
-  end
+    def spec_type desc
+      TYPES.find { |matcher, klass|
+        if matcher.respond_to? :call then
+          matcher.call desc
+        else
+          matcher === desc.to_s
+        end
+      }.last
+    end
 
-  def self.nuke_test_methods! # :nodoc:
-    self.public_instance_methods.grep(/^test_/).each do |name|
-      self.send :undef_method, name
+    @@describe_stack = []
+    def describe_stack # :nodoc:
+      @@describe_stack
     end
-  end
 
-  ##
-  # Define a 'before' action. Inherits the way normal methods should.
-  #
-  # NOTE: +type+ is ignored and is only there to make porting easier.
-  #
-  # Equivalent to MiniTest::Unit::TestCase#setup.
+    ##
+    # Returns the children of this spec.
 
-  def self.before type = nil, &block
-    define_method :setup do
-      super()
-      self.instance_eval(&block)
+    def children
+      @children ||= []
     end
-  end
 
-  ##
-  # Define an 'after' action. Inherits the way normal methods should.
-  #
-  # NOTE: +type+ is ignored and is only there to make porting easier.
-  #
-  # Equivalent to MiniTest::Unit::TestCase#teardown.
+    def nuke_test_methods! # :nodoc:
+      self.public_instance_methods.grep(/^test_/).each do |name|
+        self.send :undef_method, name
+      end
+    end
 
-  def self.after type = nil, &block
-    define_method :teardown do
-      self.instance_eval(&block)
-      super()
+    ##
+    # Define a 'before' action. Inherits the way normal methods should.
+    #
+    # NOTE: +type+ is ignored and is only there to make porting easier.
+    #
+    # Equivalent to MiniTest::Unit::TestCase#setup.
+
+    def before type = nil, &block
+      define_method :setup do
+        super()
+        self.instance_eval(&block)
+      end
     end
-  end
 
-  ##
-  # Define an expectation with name +desc+. Name gets morphed to a
-  # proper test method name. For some freakish reason, people who
-  # write specs don't like class inheritance, so this goes way out of
-  # its way to make sure that expectations aren't inherited.
-  #
-  # This is also aliased to #specify and doesn't require a +desc+ arg.
-  #
-  # Hint: If you _do_ want inheritence, use minitest/unit. You can mix
-  # and match between assertions and expectations as much as you want.
+    ##
+    # Define an 'after' action. Inherits the way normal methods should.
+    #
+    # NOTE: +type+ is ignored and is only there to make porting easier.
+    #
+    # Equivalent to MiniTest::Unit::TestCase#teardown.
+
+    def after type = nil, &block
+      define_method :teardown do
+        self.instance_eval(&block)
+        super()
+      end
+    end
+
+    ##
+    # Define an expectation with name +desc+. Name gets morphed to a
+    # proper test method name. For some freakish reason, people who
+    # write specs don't like class inheritance, so this goes way out of
+    # its way to make sure that expectations aren't inherited.
+    #
+    # This is also aliased to #specify and doesn't require a +desc+ arg.
+    #
+    # Hint: If you _do_ want inheritence, use minitest/unit. You can mix
+    # and match between assertions and expectations as much as you want.
+
+    def it desc = "anonymous", &block
+      block ||= proc { skip "(no tests defined)" }
 
-  def self.it desc = "anonymous", &block
-    block ||= proc { skip "(no tests defined)" }
+      @specs ||= 0
+      @specs += 1
 
-    @specs ||= 0
-    @specs += 1
+      name = "test_%04d_%s" % [ @specs, desc ]
 
-    name = "test_%04d_%s" % [ @specs, desc ]
+      define_method name, &block
 
-    define_method name, &block
+      self.children.each do |mod|
+        mod.send :undef_method, name if mod.public_method_defined? name
+      end
 
-    self.children.each do |mod|
-      mod.send :undef_method, name if mod.public_method_defined? name
+      name
     end
 
-    name
-  end
+    ##
+    # Essentially, define an accessor for +name+ with +block+.
+    #
+    # Why use let instead of def? I honestly don't know.
 
-  ##
-  # Essentially, define an accessor for +name+ with +block+.
-  #
-  # Why use let instead of def? I honestly don't know.
+    def let name, &block
+      define_method name do
+        @_memoized ||= {}
+        @_memoized.fetch(name) { |k| @_memoized[k] = instance_eval(&block) }
+      end
+    end
 
-  def self.let name, &block
-    define_method name do
-      @_memoized ||= {}
-      @_memoized.fetch(name) { |k| @_memoized[k] = instance_eval(&block) }
+    ##
+    # Another lazy man's accessor generator. Made even more lazy by
+    # setting the name for you to +subject+.
+
+    def subject &block
+      let :subject, &block
     end
-  end
 
-  ##
-  # Another lazy man's accessor generator. Made even more lazy by
-  # setting the name for you to +subject+.
+    def create name, desc # :nodoc:
+      cls = Class.new(self) do
+        @name = name
+        @desc = desc
 
-  def self.subject &block
-    let :subject, &block
-  end
+        nuke_test_methods!
+      end
 
-  def self.create name, desc # :nodoc:
-    cls = Class.new(self) do
-      @name = name
-      @desc = desc
+      children << cls
 
-      nuke_test_methods!
+      cls
     end
 
-    children << cls
-
-    cls
-  end
+    def name # :nodoc:
+      defined?(@name) ? @name : super
+    end
 
-  def self.to_s # :nodoc:
-    defined?(@name) ? @name : super
-  end
+    def to_s # :nodoc:
+      name # Can't alias due to 1.8.7, not sure why
+    end
 
-  # :stopdoc:
-  class << self
+    # :stopdoc:
     attr_reader :desc
     alias :specify :it
-    alias :name :to_s
+    # :startdoc:
   end
-  # :startdoc:
+
+  extend DSL
+
+  TYPES = DSL::TYPES
 end
 
 ##

data/lib/minitest/unit.rb

@@ -220,7 +220,7 @@ module MiniTest
 
     def assert_equal exp, act, msg = nil
       msg = message(msg, "") { diff exp, act }
-      assert(exp == act, msg)
+      assert exp == act, msg
     end
 
     ##
@@ -726,7 +726,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "4.6.2" # :nodoc:
+    VERSION = "4.7.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -1393,16 +1393,3 @@ module MiniTest
 end # module MiniTest
 
 Minitest = MiniTest # :nodoc: because ugh... I typo this all the time
-
-if $DEBUG then
-  module Test                # :nodoc:
-    module Unit              # :nodoc:
-      class TestCase         # :nodoc:
-        def self.inherited x # :nodoc:
-          # this helps me ferret out porting issues
-          raise "Using minitest and test/unit in the same process: #{x}"
-        end
-      end
-    end
-  end
-end

data/test/minitest/test_minitest_spec.rb

@@ -3,7 +3,11 @@ require "minitest/autorun"
 require "stringio"
 
 class MiniSpecA < MiniTest::Spec; end
-class MiniSpecB < MiniTest::Spec; end
+class MiniSpecB < MiniTest::Unit::TestCase; extend MiniTest::Spec::DSL; end
+class MiniSpecC < MiniSpecB; end
+class NamedExampleA < MiniSpecA; end
+class NamedExampleB < MiniSpecB; end
+class NamedExampleC < MiniSpecC; end
 class ExampleA; end
 class ExampleB < ExampleA; end
 
@@ -650,6 +654,26 @@ class TestMeta < MiniTest::Unit::TestCase
     MiniTest::Spec::TYPES.replace original_types
   end
 
+  def test_name
+    spec_a = describe ExampleA do; end
+    spec_b = describe ExampleB, :random_method do; end
+
+    assert_equal "ExampleA", spec_a.name
+    assert_equal "ExampleB::random_method", spec_b.name
+  end
+
+  def test_name2
+    assert_equal "NamedExampleA", NamedExampleA.name
+    assert_equal "NamedExampleB", NamedExampleB.name
+    assert_equal "NamedExampleC", NamedExampleC.name
+
+    spec_a = describe ExampleA do; end
+    spec_b = describe ExampleB, :random_method do; end
+
+    assert_equal "ExampleA", spec_a.name
+    assert_equal "ExampleB::random_method", spec_b.name
+  end
+
   def test_structure
     x, y, z, * = util_structure
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 4
-  - 6
-  - 2
-  version: 4.6.2
+  - 7
+  - 0
+  version: 4.7.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-02-28 00:00:00 Z
+date: 2013-03-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc