minitest 1.3.1 → 1.4.0

data/History.txt

@@ -1,3 +1,19 @@
+=== 1.4.0 / 2009-06-18
+
+* 5 minor enhancement:
+
+  * Added clarification doco.
+  * Added specs and mocks to autorun.
+  * Changed spec test class creation to be non-destructive.
+  * Updated rakefile for new hoe capabilities.
+  * describes are nestable (via subclass). before/after/def inherits, specs don't.
+
+* 3 bug fixes:
+
+  * Fixed location on must/wont.
+  * Switched to __name__ to avoid common ivar name.
+  * Fixed indentation in test file (1.9).
+
 === 1.3.1 / 2009-01-20
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -3,6 +3,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+design_rationale.rb
 lib/minitest/autorun.rb
 lib/minitest/mock.rb
 lib/minitest/spec.rb

data/README.txt

@@ -22,6 +22,10 @@ mini/mock, by Steven Baker, is a beautifully tiny mock object framework.
 * Contains minitest/mock - a simple and clean mock system (35 lines!).
 * Incredibly small and fast runner, but no bells and whistles.
 
+== RATIONALE:
+
+See design_rationale.rb to see how specs and tests work in minitest.
+
 == REQUIREMENTS:
 
 + Ruby 1.8, maybe even 1.6 or lower. No magic is involved.

data/Rakefile

@@ -4,46 +4,13 @@ $TESTING_MINIUNIT = true
 
 require 'rubygems'
 require 'hoe'
-require './lib/minitest/unit.rb'
 
-Hoe.new('minitest', MiniTest::Unit::VERSION) do |miniunit|
-  miniunit.rubyforge_name = "bfts"
+Hoe.plugin :seattlerb
 
-  miniunit.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
-end
-
-class Hoe # TODO: fix - I shouldn't need this
-  def run_tests(multi=false) # :nodoc:
-    tests = test_globs.map { |g| Dir.glob(g) }.flatten
-    tests.map! {|f| %Q(require "#{f}")}
-    cmd = "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
-
-    send :ruby, cmd
-  end
-end
+Hoe.spec 'minitest' do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.verbose = true
-    t.rcov_opts << "--include-file lib/test"
-    t.rcov_opts << "--no-color"
-  end
-
-  task :rcov_info do
-    pattern = ENV['PATTERN'] || "test/test_*.rb"
-    ruby "-Ilib -S rcov --text-report --include-file lib/test --save coverage.info #{pattern}"
-  end
-
-  task :rcov_overlay do
-    rcov, eol = Marshal.load(File.read("coverage.info")).last[ENV["FILE"]], 1
-    puts rcov[:lines].zip(rcov[:coverage]).map { |line, coverage|
-      bol, eol = eol, eol + line.length
-      [bol, eol, "#ffcccc"] unless coverage
-    }.compact.inspect
-  end
-rescue LoadError
-  # skip
+  self.rubyforge_name = "bfts"
 end
 
 def loc dir

data/design_rationale.rb

@@ -0,0 +1,52 @@
+# Specs:                               # Equivalent Unit Tests:
+###############################################################################
+describe Thingy do                     # class TestThingy < MiniTest::Unit::TestCase
+  before do                            #   def setup
+    do_some_setup                      #     super
+  end                                  #     do_some_setup
+                                       #   end
+  it "should do the first thing" do    #
+    1.must_equal 1                     #   def test_first_thing
+  end                                  #     assert_equal 1, 1
+                                       #   end
+  describe SubThingy do                # end
+    before do                          #
+      do_more_setup                    # class TestSubThingy < TestThingy
+    end                                #   def setup
+                                       #     super
+    it "should do the second thing" do #     do_more_setup
+      2.must_equal 2                   #   end
+    end                                #
+  end                                  #   def test_second_thing
+end                                    #     assert_equal 2, 2
+                                       #   end
+                                       # end
+###############################################################################
+# runs 2 specs                         # runs 3 tests
+###############################################################################
+# The specs generate:
+
+class ThingySpec < MiniTest::Spec
+  def setup
+    super
+    do_some_setup
+  end
+
+  def test_should_do_the_first_thing
+    assert_equal 1, 1
+  end
+end
+
+class SubThingySpec < ThingySpec
+  def setup
+    super
+    do_more_setup
+  end
+
+  # because only setup/teardown is inherited, not specs
+  remove_method :test_should_do_the_first_thing
+
+  def test_should_do_the_second_thing
+    assert_equal 2, 2
+  end
+end

data/lib/minitest/autorun.rb

@@ -1,3 +1,5 @@
 require 'minitest/unit'
+require 'minitest/spec'
+require 'minitest/mock'
 
 MiniTest::Unit.autorun

data/lib/minitest/spec.rb

@@ -49,15 +49,25 @@ end
 
 module Kernel
   def describe desc, &block
-    cls = Class.new(MiniTest::Spec)
-    Object.const_set desc.to_s.split(/\W+/).map { |s| s.capitalize }.join, cls
+    stack = MiniTest::Spec.describe_stack
+    name  = desc.to_s.split(/\W+/).map { |s| s.capitalize }.join + "Spec"
+    cls   = Object.class_eval "class #{name} < #{stack.last}; end; #{name}"
 
+    cls.nuke_test_methods!
+
+    stack.push cls
     cls.class_eval(&block)
+    stack.pop
   end
   private :describe
 end
 
 class MiniTest::Spec < MiniTest::Unit::TestCase
+  @@describe_stack = [MiniTest::Spec]
+  def self.describe_stack
+    @@describe_stack
+  end
+
   def self.current
     @@current_spec
   end
@@ -67,14 +77,29 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
     @@current_spec = self
   end
 
+  def self.nuke_test_methods!
+    self.public_instance_methods.grep(/^test_/).each do |name|
+      send :remove_method, name rescue nil
+    end
+  end
+
+  def self.define_inheritable_method name, &block
+    super_method = self.superclass.instance_method name
+
+    define_method name do
+      super_method.bind(self).call if super_method # regular super() warns
+      instance_eval(&block)
+    end
+  end
+
   def self.before(type = :each, &block)
     raise "unsupported before type: #{type}" unless type == :each
-    define_method :setup, &block
+    define_inheritable_method :setup, &block
   end
 
   def self.after(type = :each, &block)
     raise "unsupported after type: #{type}" unless type == :each
-    define_method :teardown, &block
+    define_inheritable_method :teardown, &block
   end
 
   def self.it desc, &block

data/lib/minitest/unit.rb

@@ -313,7 +313,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
 
     attr_accessor :report, :failures, :errors, :skips
     attr_accessor :test_count, :assertion_count
@@ -337,7 +337,7 @@ module MiniTest
     def location e
       last_before_assertion = ""
       e.backtrace.reverse_each do |s|
-        break if s =~ /in .(assert|refute|flunk|pass|fail|raise)/
+        break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
         last_before_assertion = s
       end
       last_before_assertion.sub(/:in .*$/, '')
@@ -424,30 +424,30 @@ module MiniTest
     end
 
     class TestCase
-      attr_reader :name
+      attr_reader :__name__
 
       def run runner
         result = '.'
         begin
           @passed = nil
           self.setup
-          self.__send__ self.name
+          self.__send__ self.__name__
           @passed = true
         rescue Exception => e
           @passed = false
-          result = runner.puke(self.class, self.name, e)
+          result = runner.puke(self.class, self.__name__, e)
         ensure
           begin
             self.teardown
           rescue Exception => e
-            result = runner.puke(self.class, self.name, e)
+            result = runner.puke(self.class, self.__name__, e)
           end
         end
         result
       end
 
       def initialize name
-        @name = name
+        @__name__ = name
         @passed = nil
       end
 

data/test/test_mini_test.rb

@@ -319,7 +319,8 @@ Finished in 0.00
     output.sub!(/^(\s+)(?:#{Regexp.union(__FILE__, File.expand_path(__FILE__))}):\d+:/o, '\1FILE:LINE:')
     output.sub!(/\[(?:#{Regexp.union(__FILE__, File.expand_path(__FILE__))}):\d+\]/o, '[FILE:LINE]')
     assert_equal(expected, output)
- end
+  end
+
   def test_run_failing_filtered
     tc = Class.new(MiniTest::Unit::TestCase) do
       def test_something

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+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-----
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,9 +41,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.1.0
     version: 
-description: minitest/unit is a small and fast replacement for ruby's huge and slow test/unit. This is meant to be clean and easy to use both as a regular test writer and for language implementors that need a minimal set of methods to bootstrap a working unit test suite.  mini/spec is a functionally complete spec engine.  mini/mock, by Steven Baker, is a beautifully tiny mock object framework.  (This package was called miniunit once upon a time)
+description: |-
+  minitest/unit is a small and fast replacement for ruby's huge and slow
+  test/unit. This is meant to be clean and easy to use both as a regular
+  test writer and for language implementors that need a minimal set of
+  methods to bootstrap a working unit test suite.
+  
+  mini/spec is a functionally complete spec engine.
+  
+  mini/mock, by Steven Baker, is a beautifully tiny mock object framework.
+  
+  (This package was called miniunit once upon a time)
 email: 
 - ryand-ruby@zenspider.com
 executables: []
@@ -39,6 +70,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- design_rationale.rb
 - lib/minitest/autorun.rb
 - lib/minitest/mock.rb
 - lib/minitest/spec.rb
@@ -48,6 +80,8 @@ files:
 - test/test_mini_test.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/bfts
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -69,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bfts
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 test_files: 
 - test/test_mini_mock.rb