minitest 2.4.0 → 2.5.0

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.5.0 / 2011-08-18
+
+* 4 minor enhancements:
+
+  * Added 2 more arguments against rspec: let & subject in 9 loc! (emmanuel/luis)
+  * Added TestCase.i_suck_and_my_tests_are_order_dependent!
+  * Extended describe to take an optional method name (2 line change!). (emmanuel)
+  * Refactored and extended minitest/pride to do full 256 color support. (lolcat)
+
+* 1 bug fix:
+
+  * Doc fixes. (chastell)
+
 === 2.4.0 / 2011-08-09
 
 * 4 minor enhancements:

data/lib/minitest/pride.rb

@@ -4,31 +4,90 @@ require "minitest/unit"
 # Show your testing pride!
 
 class PrideIO
+  ESC = "\e["
+  NND = "#{ESC}0m"
+
   attr_reader :io
 
   def initialize io
     @io = io
     # stolen from /System/Library/Perl/5.10.0/Term/ANSIColor.pm
-    @colors = (31..36).to_a
+    # also reference http://en.wikipedia.org/wiki/ANSI_escape_code
+    @colors ||= (31..36).to_a
     @size   = @colors.size
     @index  = 0
+    # io.sync = true
   end
 
   def print o
     case o
     when "." then
-      io.print "\e[#{@colors[@index % @size]}m*\e[0m"
-      @index += 1
+      io.print pride o
     when "E", "F" then
-      io.print "\e[41m\e[37m#{o}\e[0m"
+      io.print "#{ESC}41m#{ESC}37m#{o}#{NND}"
     else
       io.print o
     end
   end
 
+  def puts(*o)
+    o.map! { |s|
+      s.sub(/Finished tests/) {
+        @index = 0
+        'Fabulous tests'.split(//).map { |c|
+          pride(c)
+        }.join
+      }
+    }
+
+    super
+  end
+
+  def pride string
+    string = "*" if string == "."
+    c = @colors[@index % @size]
+    @index += 1
+    "#{ESC}#{c}m#{string}#{NND}"
+  end
+
   def method_missing msg, *args
     io.send(msg, *args)
   end
 end
 
-MiniTest::Unit.output = PrideIO.new(MiniTest::Unit.output)
+class PrideLOL < PrideIO # inspired by lolcat, but massively cleaned up
+  PI_3 = Math::PI / 3
+
+  def initialize io
+    # walk red, green, and blue around a circle separated by equal thirds.
+    #
+    # To visualize, type this into wolfram-alpha:
+    #
+    #   plot (3*sin(x)+3), (3*sin(x+2*pi/3)+3), (3*sin(x+4*pi/3)+3)
+
+    # 6 has wide pretty gradients. 3 == lolcat, about half the width
+    @colors = (0...(6 * 7)).map { |n|
+      n *= 1.0 / 6
+      r  = (3 * Math.sin(n           ) + 3).to_i
+      g  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
+      b  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
+
+      # Then we take rgb and encode them in a single number using base 6.
+      # For some mysterious reason, we add 16... to clear the bottom 4 bits?
+      # Yes... they're ugly.
+
+      36 * r + 6 * g + b + 16
+    }
+
+    super
+  end
+
+  def pride string
+    c = @colors[@index % @size]
+    @index += 1
+    "#{ESC}38;5;#{c}m#{string}#{NND}"
+  end
+end
+
+klass = ENV['TERM'] =~ /^xterm(-256color)?$/ ? PrideLOL : PrideIO
+MiniTest::Unit.output = klass.new(MiniTest::Unit.output)

data/lib/minitest/spec.rb

@@ -53,16 +53,16 @@ module Kernel # :nodoc:
   #       end
   #     end
 
-  def describe desc, &block # :doc:
+  def describe desc, additional_desc = nil, &block # :doc:
     stack = MiniTest::Spec.describe_stack
-    name  = [stack.last, desc].compact.join("::")
+    name  = [stack.last, desc, additional_desc].compact.join("::")
     sclas = stack.last || if Class === self && self < MiniTest::Spec then
                             self
                           else
                             MiniTest::Spec.spec_type desc
                           end
 
-    cls = sclas.create(name, desc)
+    cls = sclas.create name, desc
 
     stack.push cls
     cls.class_eval(&block)
@@ -116,7 +116,7 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
   end
 
   ##
-  # Returns the children of this spec"
+  # Returns the children of this spec.
 
   def self.children
     @children ||= []
@@ -183,7 +183,18 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
     end
   end
 
-  def self.create(name, desc) # :nodoc:
+  def self.let name, &block
+    define_method name do
+      @_memoized ||= {}
+      @_memoized.fetch(name) { |k| @_memoized[k] = instance_eval(&block) }
+    end
+  end
+
+  def self.subject &block
+    let :subject, &block
+  end
+
+  def self.create name, desc # :nodoc:
     cls = Class.new(self) do
       @name = name
       @desc = desc

data/lib/minitest/unit.rb

@@ -571,7 +571,7 @@ module MiniTest
     end
 
     ##
-    # Fails if +o1+ is not +op+ +o2+ nil. eg:
+    # Fails if +o1+ is not +op+ +o2+. Eg:
     #
     #   refute_operator 1, :>, 2 #=> pass
     #   refute_operator 1, :<, 2 #=> fail
@@ -614,7 +614,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "2.4.0" # :nodoc:
+    VERSION = "2.5.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -983,18 +983,24 @@ module MiniTest
 
       reset
 
+      ##
+      # Call this at the top of your tests when you absolutely
+      # positively need to have ordered tests. In doing so, you're
+      # admitting that you suck and your tests are weak.
+
+      def self.i_suck_and_my_tests_are_order_dependent!
+        class << self
+          define_method :test_order do :alpha end
+        end
+      end
+
       def self.inherited klass # :nodoc:
         @@test_suites[klass] = true
         klass.reset_setup_teardown_hooks
         super
       end
 
-      ##
-      # Defines test order and is subclassable. Defaults to :random
-      # but can be overridden to return :alpha if your tests are order
-      # dependent (read: weak).
-
-      def self.test_order
+      def self.test_order # :nodoc:
         :random
       end
 

data/test/test_minitest_spec.rb

@@ -1,8 +1,6 @@
-require 'minitest/spec'
+require 'minitest/autorun'
 require 'stringio'
 
-MiniTest::Unit.autorun
-
 describe MiniTest::Spec do
   before do
     @assertion_count = 4
@@ -196,6 +194,53 @@ describe MiniTest::Spec do
   end
 end
 
+describe MiniTest::Spec, :let do
+  i_suck_and_my_tests_are_order_dependent!
+
+  def _count
+    $let_count ||= 0
+  end
+
+  let :count do
+    $let_count += 1
+    $let_count
+  end
+
+  it "is evaluated once per example" do
+    _count.must_equal 0
+
+    count.must_equal 1
+    count.must_equal 1
+
+    _count.must_equal 1
+  end
+
+  it "is REALLY evaluated once per example" do
+    _count.must_equal 1
+
+    count.must_equal 2
+    count.must_equal 2
+
+    _count.must_equal 2
+  end
+end
+
+describe MiniTest::Spec, :subject do
+  attr_reader :subject_evaluation_count
+
+  subject do
+    @subject_evaluation_count ||= 0
+    @subject_evaluation_count  += 1
+    @subject_evaluation_count
+  end
+
+  it "is evaluated once per example" do
+    subject.must_equal 1
+    subject.must_equal 1
+    subject_evaluation_count.must_equal 1
+  end
+end
+
 class TestMeta < MiniTest::Unit::TestCase
   def test_setup
     srand 42

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 2
-  - 4
+  - 5
   - 0
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-08-10 00:00:00 Z
+date: 2011-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -46,11 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 2
-        - 10
-        version: "2.10"
+        - 11
+        version: "2.11"
   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.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking