ZenTest 3.9.2 → 3.9.3

data/History.txt

@@ -1,3 +1,24 @@
+=== 3.9.3 / 2008-06-09
+
+* 12 minor enhancements:
+
+  * Added $RUBY env support to autotest so you can swap what ruby to run.
+  * Added ALL_HOOKS array to autotest for hook devs.
+  * Added EXCLUDED_VERSIONS to multiruby. Integrated with hoe.
+  * Added miniunit compatibility to unit_diff's output.
+  * Multiruby now determines the latest versions 1.8/1.9 automatically.
+  * Removed deprecated :run hook.
+  * Fixed zentest_assertions to be compatible with miniunit. Will phase out.
+  * Minor autotest plugin cleanup / fixes.
+  * Moved assert_callback to test/rails/test_case.rb
+  * Reversed assert_includes' arguments.
+  * Updated requirements info for other ruby impls.
+  * util_capture now returns strings, not iostrings.
+
+* 1 bug fixes:
+
+  * (add|remove)_(mappings|exceptions) now all return nil to help fix autotest hooks.
+
 === 3.9.2 / 2008-03-20
 
 * 4 minor enhancements:

data/README.txt

@@ -64,10 +64,10 @@ implementation.
 
 == REQUIREMENTS
 
-* Ruby 1.6+
-* Test::Unit
+* Ruby 1.6+, JRuby 1.1.2+, or rubinius
+* Test::Unit or miniunit
 * Hoe
-* Rake or rubygems for install/uninstall
+* rubygems
 * diff.exe on windoze. Try http://gnuwin32.sourceforge.net/packages.html
 
 == INSTALL

data/bin/multiruby

@@ -7,6 +7,15 @@ def run(cmd)
   raise "ERROR: Command failed with exit code #{$?}" unless system cmd
 end
 
+def extract_latest_version url
+  file = URI.parse(url).read
+  versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
+    s =~ /preview/
+  }.sort_by { |s|
+    s.split(/\D+/).map { |i| i.to_i }
+  }.flatten.last
+end
+
 root_dir = File.expand_path(ENV['MULTIRUBY'] ||
                             File.join(ENV['HOME'], ".multiruby"))
 
@@ -22,22 +31,25 @@ Dir.chdir root_dir do
       puts "creating #{dir}"
       Dir.mkdir dir
       if dir == "versions" then
-        puts "  Downloading initial ruby tarballs to ~/.multiruby/versions:"
+        warn "  Downloading initial ruby tarballs to ~/.multiruby/versions:"
         Dir.chdir dir do
-          files = %w[ ruby-1.8.6-p111.tar.gz 1.9/ruby-1.9.0-0.tar.gz ]
-          files.each do |file|
-            require 'open-uri'
-            open("http://ftp.ruby-lang.org/pub/ruby/#{file}") do |f|
-              base = File.basename file
-              puts "    #{base} via HTTP... this might take a while."
+          require 'open-uri'
+          base_url = "http://ftp.ruby-lang.org/pub/ruby"
+
+          %w(1.8 1.9).each do |v|
+            warn "    Determining latest version for #{v}"
+            base = extract_latest_version("#{base_url}/#{v}/")
+            url = File.join base_url, v, base
+            warn "    Fetching #{base} via HTTP... this might take a while."
+            open(url) do |f|
               File.open base, 'w' do |out|
                 out.write f.read
               end
             end
           end
         end
-        puts "  ...done"
-        puts "  Put other ruby tarballs in ~/.multiruby/versions to use them."
+        warn "  ...done"
+        warn "  Put other ruby tarballs in ~/.multiruby/versions to use them."
       end
     end
   end
@@ -89,6 +101,11 @@ end
 
 versions = ENV['VERSIONS'].split(/:/) if ENV.has_key? 'VERSIONS'
 
+if ENV.has_key? 'EXCLUDED_VERSIONS' then
+  excludes = Regexp.union(*ENV['EXCLUDED_VERSIONS'].split(/:/))
+  versions = versions.delete_if { |v| v =~ excludes }
+end
+
 results = {}
 versions.each do |version|
   ruby = "#{root_dir}/install/#{version}/bin/ruby"

data/lib/autotest.rb

@@ -59,6 +59,9 @@ class Autotest
 
   T0 = Time.at 0
 
+  ALL_HOOKS = [ :all_good, :initialize, :interrupt, :quit, :ran_command,
+                :reset, :run_command, :waiting ]
+
   HOOKS = Hash.new { |h,k| h[k] = [] }
   unless defined? WINDOZE then
     WINDOZE = /win32/ =~ RUBY_PLATFORM
@@ -195,7 +198,6 @@ class Autotest
 
   def run
     hook :initialize
-    hook :run                           # TODO: phase out
     reset
     add_sigint_handler
 
@@ -484,8 +486,9 @@ class Autotest
   # Determine and return the path of the ruby executable.
 
   def ruby
-    ruby = File.join(Config::CONFIG['bindir'],
-                     Config::CONFIG['ruby_install_name'])
+    ruby = ENV['RUBY']
+    ruby ||= File.join(Config::CONFIG['bindir'],
+                       Config::CONFIG['ruby_install_name'])
 
     ruby.gsub! File::SEPARATOR, File::ALT_SEPARATOR if File::ALT_SEPARATOR
 
@@ -540,6 +543,7 @@ class Autotest
 
   def add_mapping(regexp, &proc)
     @test_mappings << [regexp, proc]
+    nil
   end
 
   ##
@@ -549,6 +553,7 @@ class Autotest
     @test_mappings.delete_if do |k,v|
       k == regexp
     end
+    nil
   end
 
   ##
@@ -558,6 +563,7 @@ class Autotest
 
   def clear_mappings
     @test_mappings.clear
+    nil
   end
 
   ############################################################
@@ -570,6 +576,7 @@ class Autotest
   def add_exception regexp
     raise "exceptions already compiled" if defined? @exceptions
     @exception_list << regexp
+    nil
   end
 
   ##
@@ -579,6 +586,7 @@ class Autotest
   def remove_exception regexp
     raise "exceptions already compiled" if defined? @exceptions
     @exception_list.delete regexp
+    nil
   end
 
   ##
@@ -588,6 +596,7 @@ class Autotest
   def clear_exceptions
     raise "exceptions already compiled" if defined? @exceptions
     @exception_list.clear
+    nil
   end
 
   ##
@@ -617,15 +626,15 @@ class Autotest
 
   def hook(name)
     deprecated = {
-      :run => :initialize,      # TODO: remove 2008-03-14 (pi day!)
+      # none currently
     }
 
     if deprecated[name] and not HOOKS[name].empty? then
       warn "hook #{name} has been deprecated, use #{deprecated[name]}"
     end
 
-    HOOKS[name].inject(false) do |handled,plugin|
-      plugin[self] || handled
+    HOOKS[name].any? do |plugin|
+      plugin[self]
     end
   end
 

data/lib/autotest/growl.rb

@@ -2,7 +2,7 @@
 
 module Autotest::Growl
   def self.growl title, msg, pri = 0, img = nil
-    title += " in #{Dir.pwd.split(/\//)[-3..-1].join("/")}"
+    title += " in #{Dir.pwd.split(/\//).last(3).join("/")}"
     msg += " at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"
     # TODO: parameterize default image
     img ||= "/Applications/Mail.app/Contents/Resources/Caution.tiff"

data/lib/autotest/rails.rb

@@ -12,6 +12,7 @@ class Autotest::Rails < Autotest
     self.add_mapping(/^lib\/.*\.rb$/) do |filename, _|
       impl = File.basename(filename, '.rb')
       files_matching %r%^test/unit/#{impl}_test.rb$%
+      # TODO: (unit|functional|integration) maybe?
     end
 
     add_mapping %r%^test/fixtures/(.*)s.yml% do |_, m|

data/lib/autotest/rcov.rb

@@ -12,5 +12,11 @@ module Autotest::RCov
   Autotest.add_hook :all_good do |at|
     system "rake #{@@command} PATTERN=#{@@pattern}"
   end
+
+  Autotest.add_hook :initialize do |at|
+    at.add_exception 'coverage'
+    at.add_exception 'coverage.info'
+    false
+  end
 end
 

data/lib/autotest/redgreen.rb

@@ -1,13 +1,21 @@
 # -*- ruby -*-
 
 # special thanks to Pat Eyler, Sean Carley, and Rob Sanheim
+# and to Peter Havens for rspec patches
 module Autotest::RedGreen
-  BAR = "=" * 80
+  BAR       = "=" * 78
+  REDCODE   = 31
+  GREENCODE = 32
 
   Autotest.add_hook :ran_command do |at|
-    if at.results.last =~ /^.* (\d+) failures, (\d+) errors$/
-      code = ($1 != "0" or $2 != "0") ? 31 : 32
-      puts "\e[#{code}m#{BAR}\e[0m\n\n"
-    end
+    green = case at.results.last
+            when /^.* (\d+) failures, (\d+) errors$/   # Test::Unit
+              ($1 == "0" and $2 == "0")
+            when /^\d+\s+examples?,\s+(\d+)\s+failure/ # RSpec
+              ($1 == "0")
+            end
+
+    code = green ? GREENCODE : REDCODE
+    puts "\e[#{ code }m#{ BAR }\e[0m\n\n" unless green.nil?
   end
 end

data/lib/autotest/screen.rb

@@ -54,11 +54,6 @@ class Autotest::Screen
     message 'Run Tests' if execute?
   end
 
-  Autotest.add_hook :interrupt do |at|
-    message 'Run Tests' if execute?
-  end
-
-
   Autotest.add_hook :quit do |at|
     clear if execute?
   end

data/lib/test/rails/controller_test_case.rb

@@ -246,7 +246,7 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
   def assert_assigned(ivar, value = NOTHING)
     ivar = ivar.to_s
     @assigns_asserted << ivar
-    assert_includes ivar, assigns, "#{ivar.inspect} missing from assigns"
+    assert_includes assigns, ivar, "#{ivar.inspect} missing from assigns"
     unless value.equal? NOTHING then
       assert_equal value, assigns[ivar],
                    "assert_assigned #{ivar.intern.inspect}"
@@ -289,7 +289,7 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
 
   def deny_assigned(ivar)
     ivar = ivar.to_s
-    deny_includes ivar, assigns
+    deny_includes assigns, ivar
   end
 
   ##

data/lib/test/rails/test_case.rb

@@ -13,3 +13,16 @@ class Test::Rails::TestCase < Test::Unit::TestCase
 
 end
 
+module Test::Unit::Assertions
+  ##
+  # TODO: should this go in this file?
+  # Asserts that model indeed has a given callback
+  #
+  # assert_callback(Model, :before_save, :something)
+
+  def assert_callback(model_class, callback, method_name, message=nil)
+    vars = model_class.instance_variable_get(:@inheritable_attributes)
+    assert vars.has_key?(callback), message
+    assert_include vars[callback], method_name, message
+  end
+end

data/lib/test/zentest_assertions.rb

@@ -1,124 +1,127 @@
+require 'test/unit/assertions'
+
 ##
 # Extra assertions for Test::Unit
 
-Test::Unit::Assertions = MiniTest::Unit::TestCase if defined? MiniTest # HACK
-
 module Test::Unit::Assertions
+  has_miniunit = defined? ::Mini
+
+  if has_miniunit then
+    alias :assert_include  :assert_includes
+    alias :deny            :refute
+    alias :deny_empty      :refute_empty
+    alias :deny_equal      :refute_equal
+    alias :deny_include    :refute_includes
+    alias :deny_includes   :refute_includes
+    alias :deny_nil        :refute_nil
+    alias :util_capture    :capture_io
+  else
+
+    alias :refute_nil :assert_not_nil
+
+    ##
+    # Asserts that +obj+ responds to #empty? and #empty? returns true.
+
+    def assert_empty(obj)
+      assert_respond_to obj, :empty?
+      assert_block "#{obj.inspect} expected to be empty." do obj.empty? end
+    end
 
-  ##
-  # TODO: should this go in this file?
-  # Asserts that model indeed has a given callback
-  #
-  # assert_callback(Model, :before_save, :something)
-
-  def assert_callback(model_class, callback, method_name, message=nil)
-    vars = model_class.instance_variable_get(:@inheritable_attributes)
-    assert vars.has_key?(callback), message
-    assert_include vars[callback], method_name, message
-  end
-
-  ##
-  # Asserts that +obj+ responds to #empty? and #empty? returns true.
-
-  def assert_empty(obj)
-    assert_respond_to obj, :empty?
-    assert_block "#{obj.inspect} expected to be empty." do obj.empty? end
-  end
+    ##
+    # Like assert_in_delta but better dealing with errors proportional
+    # to the sizes of +a+ and +b+.
 
-  ##
-  # Like assert_in_delta but better dealing with errors proportional
-  # to the sizes of +a+ and +b+.
+    def assert_in_epsilon(a, b, epsilon, message = nil)
+      return assert(true) if a == b # count assertion
 
-  def assert_in_epsilon(a, b, epsilon, message = nil)
-    return assert(true) if a == b # count assertion
+      error = ((a - b).to_f / ((b.abs > a.abs) ? b : a)).abs
+      message ||= "#{a} expected to be within #{epsilon * 100}% of #{b}, was #{error}"
 
-    error = ((a - b).to_f / ((b.abs > a.abs) ? b : a)).abs
-    message ||= "#{a} expected to be within #{epsilon * 100}% of #{b}, was #{error}"
+      assert_block message do error <= epsilon end
+    end
 
-    assert_block message do error <= epsilon end
-  end
+    ##
+    # Asserts that +collection+ includes +obj+.
 
-  ##
-  # Asserts that +obj+ responds to #include? and that obj includes +item+.
+    def assert_include collection, obj, msg = nil
+      assert_respond_to collection, :include?
 
-  def assert_include(item, obj, message = nil)
-    assert_respond_to obj, :include?
-    message ||= "#{obj.inspect}\ndoes not include\n#{item.inspect}."
-    assert_block message do obj.include? item end
-  end
+      message ||= "#{collection.inspect}\ndoes not include\n#{obj.inspect}."
+      assert_block message do collection.include?(obj) end
+    end
 
-  alias assert_includes assert_include
+    alias assert_includes assert_include
 
-  ##
-  # Asserts that +boolean+ is not false or nil.
+    ##
+    # Asserts that +boolean+ is not false or nil.
 
-  def deny(boolean, message = nil)
-    _wrap_assertion do
-      assert_block(build_message(message, "<?> is not false or nil.", boolean)) { not boolean }
+    def deny(boolean, message = nil)
+      _wrap_assertion do
+        assert_block(build_message(message, "Failed refutation, no message given.")) { not boolean }
+      end
     end
-  end
 
-  ##
-  # Asserts that +obj+ responds to #empty? and #empty? returns false.
+    ##
+    # Asserts that +obj+ responds to #empty? and #empty? returns false.
 
-  def deny_empty(obj)
-    assert_respond_to obj, :empty?
-    assert_block "#{obj.inspect} expected to have stuff." do !obj.empty? end
-  end
+    def deny_empty(obj)
+      assert_respond_to obj, :empty?
+      assert_block "#{obj.inspect} expected to have stuff." do !obj.empty? end
+    end
 
-  ##
-  # Alias for assert_not_equal
+    ##
+    # Alias for assert_not_equal
 
-  alias deny_equal assert_not_equal # rescue nil
+    alias deny_equal assert_not_equal # rescue nil # rescue for miniunit
 
-  ##
-  # Asserts that +obj+ responds to #include? and that obj does not include
-  # +item+.
+    ##
+    # Asserts that +obj+ responds to #include? and that obj does not include
+    # +item+.
 
-  def deny_include(item, obj, message = nil)
-    assert_respond_to obj, :include?
-    message ||= "#{obj.inspect} includes #{item.inspect}."
-    assert_block message do !obj.include? item end
-  end
+    def deny_include(collection, obj, message = nil)
+      assert_respond_to collection, :include?
+      message ||= "#{collection.inspect} includes #{obj.inspect}."
+      assert_block message do !collection.include? obj end
+    end
 
-  alias deny_includes deny_include
-
-  ##
-  # Asserts that +obj+ is not nil.
-
-  alias deny_nil assert_not_nil
-
-  ##
-  # Captures $stdout and $stderr to StringIO objects and returns them.
-  # Restores $stdout and $stderr when done.
-  #
-  # Usage:
-  #   def test_puts
-  #     out, err = capture do
-  #       puts 'hi'
-  #       STDERR.puts 'bye!'
-  #     end
-  #     assert_equal "hi\n", out.string
-  #     assert_equal "bye!\n", err.string
-  #   end
-
-  def util_capture
-    require 'stringio'
-    orig_stdout = $stdout.dup
-    orig_stderr = $stderr.dup
-    captured_stdout = StringIO.new
-    captured_stderr = StringIO.new
-    $stdout = captured_stdout
-    $stderr = captured_stderr
-    yield
-    captured_stdout.rewind
-    captured_stderr.rewind
-    return captured_stdout, captured_stderr
-  ensure
-    $stdout = orig_stdout
-    $stderr = orig_stderr
+    alias deny_includes deny_include
+
+    ##
+    # Asserts that +obj+ is not nil.
+
+    alias deny_nil assert_not_nil
+
+    ##
+    # Captures $stdout and $stderr to StringIO objects and returns them.
+    # Restores $stdout and $stderr when done.
+    #
+    # Usage:
+    #   def test_puts
+    #     out, err = capture do
+    #       puts 'hi'
+    #       STDERR.puts 'bye!'
+    #     end
+    #     assert_equal "hi\n", out.string
+    #     assert_equal "bye!\n", err.string
+    #   end
+
+    def util_capture
+      require 'stringio'
+      orig_stdout = $stdout.dup
+      orig_stderr = $stderr.dup
+      captured_stdout = StringIO.new
+      captured_stderr = StringIO.new
+      $stdout = captured_stdout
+      $stderr = captured_stderr
+      yield
+      captured_stdout.rewind
+      captured_stderr.rewind
+      return captured_stdout.string, captured_stderr.string
+    ensure
+      $stdout = orig_stdout
+      $stderr = orig_stderr
+    end
   end
-
 end
 
 class Object # :nodoc:

data/lib/unit_diff.rb

@@ -115,15 +115,21 @@ class UnitDiff
         header << result.shift
         state = :expect if result.first =~ /^<|^Expected/
       when :expect then
-        if result.first =~ /^Expected (.*?) to equal (.*?):$/ then
+        case result.first
+        when /^Expected (.*?) to equal (.*?):$/ then
           expect << $1
           butwas << $2
           state = :footer
           result.shift
-        elsif result.first =~ /^Expected (.*?)$/ then
+        when /^Expected (.*?), not (.*)$/m then
+          expect << $1
+          butwas << $2
+          state = :footer
+          result.shift
+        when /^Expected (.*?)$/ then
           expect << "#{$1}\n"
           result.shift
-        elsif result.first =~ /^to equal / then
+        when /^to equal / then
           state = :spec_butwas
           bw = result.shift.sub(/^to equal (.*):?$/, '\1')
           butwas << bw

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.9.2'
+  VERSION = '3.9.3'
 
   include ZenTestMapping
 

data/test/test_autotest.rb

@@ -27,9 +27,13 @@ end
 
 class TestAutotest < Test::Unit::TestCase
 
-  def deny test
-    assert ! test
-  end
+  def deny test, msg=nil
+    if msg then
+      assert ! test, msg
+    else
+      assert ! test
+    end
+  end unless respond_to? :deny
 
   RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) unless defined? RUBY
 
@@ -313,30 +317,24 @@ test_error2(#{@test_class}):
     deny @a.tainted
   end
 
-  def test_hook_overlap
-    Autotest.clear_hooks
+  def test_hook_overlap_returning_false
+    util_reset_hooks_returning false
 
-    @a.instance_variable_set :@blah1, false
-    @a.instance_variable_set :@blah2, false
-    @a.instance_variable_set :@blah3, false
-
-    Autotest.add_hook(:blah) do |at|
-      at.instance_variable_set :@blah1, true
-    end
+    @a.hook :blah
 
-    Autotest.add_hook(:blah) do |at|
-      at.instance_variable_set :@blah2, true
-    end
+    assert @a.instance_variable_get(:@blah1), "Hook1 should work on blah"
+    assert @a.instance_variable_get(:@blah2), "Hook2 should work on blah"
+    assert @a.instance_variable_get(:@blah3), "Hook3 should work on blah"
+  end
 
-    Autotest.add_hook(:blah) do |at|
-      at.instance_variable_set :@blah3, true
-    end
+  def test_hook_overlap_returning_true
+    util_reset_hooks_returning true
 
     @a.hook :blah
 
     assert @a.instance_variable_get(:@blah1), "Hook1 should work on blah"
-    assert @a.instance_variable_get(:@blah2), "Hook2 should work on blah"
-    assert @a.instance_variable_get(:@blah3), "Hook3 should work on blah"
+    deny @a.instance_variable_get(:@blah2), "Hook2 should NOT work on blah"
+    deny @a.instance_variable_get(:@blah3), "Hook3 should NOT work on blah"
   end
 
   def test_hook_response
@@ -425,4 +423,27 @@ test_error2(#{@test_class}):
   def util_path_to_classname(e,i)
     assert_equal e, @a.path_to_classname(i)
   end
+
+  def util_reset_hooks_returning val
+    Autotest.clear_hooks
+
+    @a.instance_variable_set :@blah1, false
+    @a.instance_variable_set :@blah2, false
+    @a.instance_variable_set :@blah3, false
+
+    Autotest.add_hook(:blah) do |at|
+      at.instance_variable_set :@blah1, true
+      val
+    end
+
+    Autotest.add_hook(:blah) do |at|
+      at.instance_variable_set :@blah2, true
+      val
+    end
+
+    Autotest.add_hook(:blah) do |at|
+      at.instance_variable_set :@blah3, true
+      val
+    end
+  end
 end

data/test/test_rails_helper_test_case.rb

@@ -33,15 +33,15 @@ class TestRailsHelperTestCase < Test::Unit::TestCase
   def test_self_inherited
     assert defined? TRHelperTest
 
-    assert_includes 'tr_helper', TRHelperTest.instance_methods
+    assert_includes TRHelperTest.instance_methods, 'tr_helper'
   end
 
   def test_self_inherited_namespaced
     assert defined? Widgets
     assert defined? Widgets::SomeHelperTest
 
-    assert_includes 'widgets_some_helper',
-                    Widgets::SomeHelperTest.instance_methods
+    assert_includes(Widgets::SomeHelperTest.instance_methods,
+                    'widgets_some_helper')
   end
 
 end if $TESTING_RTC

data/test/test_rails_view_test_case.rb

@@ -45,12 +45,12 @@ class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
     assert_equal 4, @assert_select.length
 
-    assert_equal ["form[action='/game/save']"], @assert_select.shift
-    assert_equal ["input[type='text'][name='game[amount]']"],
-                 @assert_select.shift
+    assert_equal @assert_select.shift, ["form[action='/game/save']"]
+    assert_equal(@assert_select.shift,
+                 ["input[type='text'][name='game[amount]']"])
 
-    assert_equal ["form[action='/game/save']"], @assert_select.shift
-    assert_equal ["label[for='game_amount']"], @assert_select.shift
+    assert_equal @assert_select.shift, ["form[action='/game/save']"]
+    assert_equal @assert_select.shift, ["label[for='game_amount']"]
   end
 
   def test_assert_form
@@ -167,10 +167,12 @@ class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
     assert_equal 2, @assert_select.length
 
-    assert_include ["select[name='game[location_id]'] option[value='2']",
-                   { :text => 'Guaymas' }], @assert_select
-    assert_include ["select[name='game[location_id]'] option[value='1']",
-                   { :text => 'Ballet' }], @assert_select
+    assert_include(@assert_select,
+                   ["select[name='game[location_id]'] option[value='2']",
+                    { :text => 'Guaymas' }])
+    assert_include(@assert_select,
+                   ["select[name='game[location_id]'] option[value='1']",
+                    { :text => 'Ballet' }])
   end
 
   def test_assert_select_tag_form
@@ -179,12 +181,14 @@ class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
     assert_equal 4, @assert_select.length
 
-    assert_include ["form[action='/game/save']"], @assert_select
-    assert_include ["select[name='game[location_id]'] option[value='2']",
-                   { :text => 'Guaymas' }], @assert_select
-    assert_include ["form[action='/game/save']"], @assert_select
-    assert_include ["select[name='game[location_id]'] option[value='1']",
-                   { :text => 'Ballet' }], @assert_select
+    assert_include @assert_select, ["form[action='/game/save']"]
+    assert_include(@assert_select,
+                   ["select[name='game[location_id]'] option[value='2']",
+                    { :text => 'Guaymas' }])
+    assert_include @assert_select, ["form[action='/game/save']"]
+    assert_include(@assert_select,
+                   ["select[name='game[location_id]'] option[value='1']",
+                    { :text => 'Ballet' }])
   end
 
   def test_assert_submit

data/test/test_unit_diff.rb

@@ -25,7 +25,24 @@ class TestUnitDiff < Test::Unit::TestCase
     util_unit_diff(header, input, expected, :parse_input)
   end
 
-  def test_input_mini_rspec
+  def test_input_miniunit
+    header = "Loaded suite -e\nStarted\nF\nFinished in 0.035332 seconds.\n\n"
+    input = "#{header}  1) Failure:
+test_blah(TestBlah) [./blah.rb:25]:
+Expected ['a', 'b', 'c'], not ['a', 'c', 'b'].
+
+1 tests, 1 assertions, 1 failures, 0 errors
+"
+
+    expected = [[["  1) Failure:\n",
+                  "test_blah(TestBlah) [./blah.rb:25]:\n",
+                  "Expected ['a', 'b', 'c'], not ['a', 'c', 'b'].\n"]],
+                ["\n", "1 tests, 1 assertions, 1 failures, 0 errors\n"]]
+
+    util_unit_diff(header, input, expected, :parse_input)
+  end
+
+  def test_input_mspec
     header = <<-HEADER
 Started
 .......F
@@ -40,15 +57,15 @@ Expected nil to equal "baz":
     FAILURE
 
     backtrace = <<-BACKTRACE
-      PositiveExpectation#== at spec/mini_rspec.rb:217
+      PositiveExpectation#== at spec/mspec.rb:217
           main.__script__ {} at spec/language/unless_spec.rb:49
                    Proc#call at kernel/core/proc.rb:127
-               SpecRunner#it at spec/mini_rspec.rb:368
-                     main.it at spec/mini_rspec.rb:412
+               SpecRunner#it at spec/mspec.rb:368
+                     main.it at spec/mspec.rb:412
           main.__script__ {} at spec/language/unless_spec.rb:48
                    Proc#call at kernel/core/proc.rb:127
-         SpecRunner#describe at spec/mini_rspec.rb:378
-               main.describe at spec/mini_rspec.rb:408
+         SpecRunner#describe at spec/mspec.rb:378
+               main.describe at spec/mspec.rb:408
              main.__script__ at spec/language/unless_spec.rb:3
     CompiledMethod#as_script at kernel/bootstrap/primitives.rb:41
                    main.load at kernel/core/compile.rb:150
@@ -73,7 +90,7 @@ Expected nil to equal "baz":
     util_unit_diff(header, input, expected, :parse_input)
   end
 
-  def test_input_mini_rspec_multiline
+  def test_input_mspec_multiline
     header = <<-HEADER
 Started
 .......F
@@ -89,7 +106,7 @@ to equal #<TestGenerator [[:push, false], [:gif, #<Label 5>], [:push, "foo"], [:
       FAILURE
 
 backtrace = <<-BACKTRACE
-      PositiveExpectation#== at spec/mini_rspec.rb:216
+      PositiveExpectation#== at spec/mspec.rb:216
                     main.gen at ./compiler2/spec/helper.rb:125
           main.__script__ {} at compiler2/spec/control_spec.rb:448
     BACKTRACE
@@ -117,11 +134,39 @@ backtrace = <<-BACKTRACE
              "<\"<body>\">.\n"
             ]
 
-    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["<html>"], ["<body>"], []]
+    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"],
+                ["<html>"],
+                ["<body>"],
+                []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
 
+  def test_parse_diff_miniunit
+    input = ["  1) Failure:\n",
+             "test_blah(TestBlah) [./blah.rb:25]:\n",
+             "Expected ['a', 'b', 'c'], not ['a', 'c', 'b'].\n"]
+
+    expected = [["  1) Failure:\n", "test_blah(TestBlah) [./blah.rb:25]:\n"],
+                ["['a', 'b', 'c']"],
+                ["['a', 'c', 'b']"],
+                []]
+
+    assert_equal expected, @diff.parse_diff(input)
+  end
+
+  def test_parse_diff_miniunit_multiline
+    input = ["  1) Failure:\n",
+             "test_blah(TestBlah) [./blah.rb:25]:\n",
+             "Expected ['a',\n'b',\n'c'], not ['a',\n'c',\n'b'].\n"]
+
+    expected = [["  1) Failure:\n", "test_blah(TestBlah) [./blah.rb:25]:\n"],
+                ["['a',\n'b',\n'c']"],
+                ["['a',\n'c',\n'b']"],
+                []]
+
+    assert_equal expected, @diff.parse_diff(input)
+  end
   def test_parse_diff1
     input = ["  1) Failure:\n",
              "test_test1(TestBlah) [./blah.rb:25]:\n",
@@ -188,29 +233,29 @@ backtrace = <<-BACKTRACE
     assert_equal expected, @diff.parse_diff(input)
   end
 
-  def test_parse_diff_mini_rspec
+  def test_parse_diff_mspec
     input = ["1)\n", "The unless expression should fail FAILED\n",
       "Expected nil to equal \"baz\":\n",
-      "    PositiveExpectation#== at spec/mini_rspec.rb:217\n"]
+      "    PositiveExpectation#== at spec/mspec.rb:217\n"]
 
     expected = [["1)\n", "The unless expression should fail FAILED\n"],
       ["nil"],
       ["\"baz\""],
-      ["    PositiveExpectation#== at spec/mini_rspec.rb:217"]]
+      ["    PositiveExpectation#== at spec/mspec.rb:217"]]
 
     assert_equal expected, @diff.parse_diff(input)
   end
 
-  def test_parse_diff_mini_rspec_multiline
+  def test_parse_diff_mspec_multiline
     input = ["1)\n", "The unless expression should fail FAILED\n",
     "Expected #<TestGenerator [[:push, :true],\n", "  [:dup]\n", "]\n",
     "to equal #<TestGenerator [[:pop],\n", "  [:dup]\n", "]:\n",
-    "    PositiveExpectation#== at spec/mini_rspec.rb:217\n"]
+    "    PositiveExpectation#== at spec/mspec.rb:217\n"]
 
     expected = [["1)\n", "The unless expression should fail FAILED\n"],
       ["#<TestGenerator [[:push, :true],\n", "  [:dup]\n", "]"],
       ["#<TestGenerator [[:pop],\n", "  [:dup]\n", "]"],
-      ["    PositiveExpectation#== at spec/mini_rspec.rb:217"]]
+      ["    PositiveExpectation#== at spec/mspec.rb:217"]]
 
     assert_equal expected, @diff.parse_diff(input)
   end

data/test/test_zentest.rb

@@ -229,7 +229,7 @@ end
   # Accessors & Adders:
 
   def test_initialize
-    assert_not_nil(@tester, "Tester must be initialized")
+    refute_nil(@tester, "Tester must be initialized")
     # TODO: should do more at this stage
   end
 

data/test/test_zentest_assertions.rb

@@ -2,80 +2,115 @@ require 'test/unit'
 require 'test/zentest_assertions'
 
 class TestZenTestAssertions < Test::Unit::TestCase
+  @@has_mini = defined? Mini
+  @@exception = if @@has_mini then
+                  Mini::Assertion
+                else
+                  Test::Unit::AssertionFailedError
+                end
+
+  def util_assert_triggered expected
+    e = assert_raises @@exception do
+      yield
+    end
+
+    assert_equal expected, e.message.sub(/(---Backtrace---).*/m, '\1')
+  end
 
   def test_assert_empty
     assert_empty []
 
-    e = assert_raise Test::Unit::AssertionFailedError do
+    msg = if @@has_mini then
+            "Expected [true] to be empty."
+          else
+            "[true] expected to be empty."
+          end
+
+    util_assert_triggered msg do
       assert_empty [true]
     end
-
-    assert_equal "[true] expected to be empty.", e.message
   end
 
   def test_assert_include
-    assert_include true, [true]
+    assert_include [true], true
 
-    e = assert_raise Test::Unit::AssertionFailedError do
-      assert_include false, [true]
-    end
+    msg = if @@has_mini then
+            "Expected [true] to include false."
+          else
+            "[true]\ndoes not include\nfalse."
+          end
 
-    assert_equal "[true]\ndoes not include\nfalse.", e.message
+    util_assert_triggered msg do
+      assert_include [true], false
+    end
   end
 
   def test_assert_in_epsilon
-      assert_in_epsilon 1.234, 1.234, 0.0001
+    assert_in_epsilon 1.234, 1.234, 0.0001
 
-    e = assert_raise Test::Unit::AssertionFailedError do
+    msg = if @@has_mini then
+            "Expected 1.235 - 1.234 (0.00100000000000011) to be < 0.0001234."
+          else
+            "1.235 expected to be within 0.01% of 1.234, was 0.000809716599190374"
+          end
+
+    util_assert_triggered msg do
       assert_in_epsilon 1.235, 1.234, 0.0001
     end
-
-    assert_equal "1.235 expected to be within 0.01% of 1.234, was 0.000809716599190374", e.message
   end
 
   def test_deny
     deny false
     deny nil
 
-    e = assert_raise Test::Unit::AssertionFailedError do
+    e = assert_raises Test::Unit::AssertionFailedError do
       deny true
     end
 
-    assert_equal "<true> is not false or nil.", e.message
+    assert_match(/Failed refutation, no message given/, e.message)
   end
 
   def test_deny_empty
     deny_empty [true]
 
-    e = assert_raise Test::Unit::AssertionFailedError do
+    msg = if @@has_mini then
+            "Expected [] to not be empty."
+          else
+            "[] expected to have stuff."
+          end
+
+    util_assert_triggered msg do
       deny_empty []
     end
 
-    assert_equal "[] expected to have stuff.", e.message
   end
 
   def test_deny_equal
     deny_equal true, false
     
-    assert_raise Test::Unit::AssertionFailedError do
+    assert_raises Test::Unit::AssertionFailedError do
       deny_equal true, true
     end
   end
 
   def test_deny_include
-    deny_include false, [true]
+    deny_include [true], false
 
-    e = assert_raise Test::Unit::AssertionFailedError do
-      deny_include true, [true]
-    end
+    msg = if @@has_mini then
+            "Expected [true] to not include true."
+          else
+            "[true] includes true."
+          end
 
-    assert_equal "[true] includes true.", e.message
+    util_assert_triggered msg do
+      deny_include [true], true
+    end
   end
 
   def test_deny_nil
     deny_nil false
 
-    assert_raise Test::Unit::AssertionFailedError do
+    assert_raises Test::Unit::AssertionFailedError do
       deny_nil nil
     end
   end
@@ -86,9 +121,8 @@ class TestZenTestAssertions < Test::Unit::TestCase
       $stderr.puts 'err'
     end
 
-    assert_equal "out\n", out.string
-    assert_equal "err\n", err.string
+    assert_equal "out\n", out
+    assert_equal "err\n", err
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.9.2
+  version: 3.9.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-20 00:00:00 -07:00
+date: 2008-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
 description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking!  Test::Rails helps you build industrial-strength Rails code."
 email: 
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: zentest
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails"