ZenTest 3.3.0 → 3.4.0

data/History.txt

@@ -1,8 +1,31 @@
+*** 3.4.0 / 2006-09-12
+
++ 13 minor enhancements:
+	* Broke out example_dot_autotest into multiple files in lib.
+	* Enhanced hook system so it can return true if event handled.
+	* Sleep is now 1 second by default because life is too short.
+	* Hooked interrupt with new hook system. First handler wins.
+	* Hooked test results before output
+	* Accurate test counts for Test::Rails.
+	* Added snarl autotest plugin, thanks to Patrick Hurley.
+	* Added timestamp autotest plugin, thanks to Joe Goldberg.
+	* Added redgreen, thanks to Pat Eyler, Sean Carley, and Rob Sanheim.
+	* Added kdenotify autotest plugin, thanks to Geir Freysson.
+	* Added markaby support for Test::Rails.
+	* Added hack to display a tree of render calls.
+	* Added hook to perform extra setup for 
++ 5 bug fixes:
+	- Extended zentest to deal with rails a bit better... ugh.
+	- Fixed @libs for windoze.
+	- Fixed inner class/test identification in autotest.
+	- Namespaced all plugins... eric is anal.
+	- No longer freak out if rubygems tarball not in multiruby/versions.
+
 *** 3.3.0 / 2006-07-28
 
 + 1 major enhancement:
 	+ autotest has been rewritten to be much cleaner, now has a plugin system.
-+ 5 minor enhancement:
++ 5 minor enhancements:
 	+ test/rails adds helper tests, "stolen" from Geoff's work, (which was "stolen" from ryan's work. :P)
 	+ autotest turnaround is now faster.
 	+ Added more prune dirs to autotest.
@@ -33,10 +56,10 @@
 
 *** 3.1.0 / 2006-03-29
 
-+ 2 major enhancements
++ 2 major enhancements:
 	+ Added multiruby! YAY!
 	+ Massive improvements to autotest: speed, reliability, reporting, etc.
-+ 10 minor enhancements
++ 10 minor enhancements:
 	+ multiruby builds in a centralized location. YAY!
 	+ multiruby now allows reinstalls quickly and easily (can even skip config).
 	+ multiruby exits with total sum of exit codes.
@@ -47,7 +70,7 @@
 	+ autotest always runs with unit_diff -u.
 	+ autotest can now run cvs/svn/p4 up periodically to be a mini-tinderbox.
 	+ autotest now has real help.
-+ 4 bug fixes
++ 4 bug fixes:
 	+ ZenTest is now zentest. Yay for consistency! (do a rake uninstall to clean)
 	+ ZenTest excludes pretty_print methods.
 	+ Fixed unary operator issues (they were backwards... oops!) for ZenTest.
@@ -55,25 +78,25 @@
 
 *** 3.0.0 / 2006-03-06
 
-+ 2 major enhancements
++ 2 major enhancements:
 	+ Added autotest and rails_autotest. YAY for continous testing!
 	+ Repackaged and gemified. YAY for gemification!
-+ 3 minor enhancements
++ 3 minor enhancements:
 	+ Added non-mappable tests starting with test_integration_.
 	+ Lots of code and test refactoring and cleanup.
 	+ Massive improvement on unit tests.
-+ 3 bug fixes
++ 3 bug fixes:
 	+ Cleaned up class method inheritence. Esp relevant for rails testing.
 	+ Finally fixed the unit_diff parse bug!
 	+ Fixed improper counting of errors if a class was missing, should be 1 + missing methods.
 
 *** 2.4.0 / 2005-03-21
 
-+ 3 minor enhancements
++ 3 minor enhancements:
 	+ Able to audit standard class library (so now we can audit rubicon!).
 	+ Able to map against class methods (self.blah <=> test_class_blah).
 	+ Added -I=rubypath support 
-+ 4 bug fixes
++ 4 bug fixes:
 	+ bug:1151 Fixed stupid problem w/ unit_diff.
 	+ bug:1454 code generation correctly matches class/module for nested classes.
 	+ bug:1455 Updated method mapping to work on all operators listed in my quickref.
@@ -81,14 +104,14 @@
 
 *** 2.3.0 / 2004-11-18
 
-+ 6 minor enhancements
++ 6 minor enhancements:
 	+ Massively expanded the method name mappings.
 	+ Added -r flag to reverse map names, for Rails style testing.
 	+ Added -e to auto eval tests generated.
 	+ Added -b & -c flags in unit_diff (passed to diff)
 	+ Added install and uninstall rules to Makefile.
 	+ Added some more doco to README.txt
-+ 7 bug fixes
++ 7 bug fixes:
 	+ Cleaned up and refactored tests.
 	+ Changed the way files are generated, to accomodate new flags.
 	+ Added some more tests.
@@ -99,19 +122,19 @@
 
 *** 2.2.0 / 2004-10-18
 
-+ 4 minor enhancements
++ 4 minor enhancements:
 	+ Added LinuxJournalArticle.txt! WOOT!
 	+ Added unit_diff.rb - a very cool filter for test output!
 	+ Extended ZenTest to work with standard input
 	+ Added "ZenTest FULL" to force ZenTest to analyze inherited methods, for subclasses of the standard library.
-+ 3 bug fixes
++ 3 bug fixes:
 	+ Extended makefile to be more dynamic and stop diffing versions. ugh.
 	+ Expanded the method rename map to handle <<, *, +, and ==. 
 	+ Added more test cases.
 
 *** 2.1.2 / 2004-03-08
 
-+ 3 bug fixes
++ 4 bug fixes:
 	+ Fixed yet another 1.8ism, results will be the same in 1.8 and 1.6.
 	+ Fixed code responsible for method name conversion.
 	+ I am a moron... didn't run tests after updating version.
@@ -119,41 +142,41 @@
 
 *** 2.1.1 / 2004-03-06
 
-+ 3 bug fixes
++ 3 bug fixes:
 	+ Fixed a 1.8ism.
 	+ Removed zentestrunner. Older ruby users will just have to suffer.
 	+ Updated history to ZenWeb format.
 
 *** 2.1.0 / 2003-01-07
 
-+ 3 major enhancements
++ 3 major enhancements:
 	+ Output is runnable as-is thanks to zentestrunner.rb.
 	+ Wrapped up all running functionality into ZenTest.fix
 	+ Added simple statistic output... Thanks Dave & Andy!!!
-+ 1 minor enhancement
++ 2 minor enhancements:
 	+ Added zentestrunner.rb until Nathaniel accepts my changes!
-+ 3 bug fixes
-	+ Removed at_exit override and avoided test/unit altogether.
 	+ Added a clean rule to Makefile
++ 3 bug fixes:
+	+ Removed at_exit override and avoided test/unit altogether.
 	+ Extended README.txt to include some of the rules.
 	+ Fixed several tests and added assertions for new stats
 
 *** 2.0.0 / 2002-10-29
 
-+ 2 major enhancements
++ 2 major enhancements:
 	+ Rewrite of ZenTest.rb into actual OO design.
 	+ Added unit tests, finally...
 
 *** 1.0.1 / 2002-09-28
 
-+ 1 minor enhancements
++ 1 minor enhancement:
 	+ Only loads when a class is detected, allows some scripts to be skipped.
-+ 3 bug fixes
++ 3 bug fixes:
 	+ Cleaned up output. Verbose when $DEBUG is true.
 	+ Added an error count that is output at end.
 	+ Better filtering or conversion on some method names.
 
 *** 1.0.0 / 2002-09-24
 
-+ 1 major enhancements
++ 1 major enhancement:
 	+ Birthday!

data/Manifest.txt

@@ -15,6 +15,14 @@ example1.rb
 example2.rb
 example_dot_autotest.rb
 lib/autotest.rb
+lib/autotest/growl.rb
+lib/autotest/html_report.rb
+lib/autotest/kdenotify.rb
+lib/autotest/menu.rb
+lib/autotest/pretty.rb
+lib/autotest/redgreen.rb
+lib/autotest/snarl.rb
+lib/autotest/timestamp.rb
 lib/rails_autotest.rb
 lib/ruby_fork.rb
 lib/test/rails.rb
@@ -24,6 +32,7 @@ lib/test/rails/helper_test_case.rb
 lib/test/rails/ivar_proxy.rb
 lib/test/rails/pp_html_document.rb
 lib/test/rails/rake_tasks.rb
+lib/test/rails/render_tree.rb
 lib/test/rails/test_case.rb
 lib/test/rails/view_test_case.rb
 lib/test/zentest_assertions.rb

data/README.txt

@@ -66,6 +66,7 @@ implementation.
 * Ruby 1.6+
 * Test::Unit
 * Rake or rubygems for install/uninstall
+* diff.exe on windoze. Try http://gnuwin32.sourceforge.net/packages.html
 
 == INSTALL
 

data/bin/multiruby

@@ -38,7 +38,7 @@ Dir.chdir root_dir do
 
   tarballs = Dir["versions/rubygems*.tgz"]
   raise "You should delete all but one rubygem tarball" if tarballs.size > 1
-  rubygem_tarball = File.expand_path tarballs.last
+  rubygem_tarball = File.expand_path tarballs.last rescue nil
 
   Dir.chdir "build" do
     Dir["../versions/ruby*.tar.gz"].each do |tarball|

data/example_dot_autotest.rb

@@ -1,148 +1,10 @@
 # -*- ruby -*-
 
-module AutoGrowl
-  def self.growl title, msg, pri=0
-    system "growlnotify -n autotest --image /Applications/Mail.app/Contents/Resources/Caution.tiff -p #{pri} -m #{msg.inspect} #{title}"
-  end
-
-  Autotest.add_hook :run do  |at|
-    growl "Run", "Run" unless $TESTING
-  end
-
-  Autotest.add_hook :red do |at|
-    growl "Tests Failed", "#{at.files_to_test.size} tests failed", 2
-  end
-
-  Autotest.add_hook :green do |at|
-    growl "Tests Passed", "All tests passed", -2 if at.tainted 
-  end
-
-  Autotest.add_hook :init do |at|
-    growl "autotest", "autotest was started" unless $TESTING
-  end
-
-  Autotest.add_hook :interrupt do |at|
-    growl "autotest", "autotest was reset" unless $TESTING
-  end
-
-  Autotest.add_hook :quit do |at|
-    growl "autotest", "autotest is exiting" unless $TESTING
-  end
-
-  Autotest.add_hook :all do |at|_hook
-    growl "autotest", "Tests have fully passed", -2 unless $TESTING
-  end
-end
-
-module HtmlConsole
-  MAX = 30
-  STATUS = {}
-  PATH = File.expand_path("~/Sites/autotest.html")
-
-  def self.update
-    STATUS.delete STATUS.keys.sort.last if STATUS.size > MAX
-    File.open(PATH, "w") do |f|
-      f.puts "<title>Autotest Status</title>"
-      STATUS.sort.reverse.each do |t,s|
-        if s > 0 then
-          f.puts "<p style=\"color:red\">#{t}: #{s}"
-        else
-          f.puts "<p style=\"color:green\">#{t}: #{s}"
-        end
-      end
-    end
-  end
-
-  Autotest.add_hook :red do |at|
-    STATUS[Time.now] = at.files_to_test.size
-    update
-  end
-
-  Autotest.add_hook :green do |at|
-    STATUS[Time.now] = 0
-    update
-  end
-end
-
-require 'osx/cocoa'
-include Math
-include OSX
-
-OSX::NSBundle.bundleWithPath(File.expand_path("~/Library/Frameworks/Aquaterm.framework")).load
-OSX.ns_import :AQTAdapter
-
-class StatusBoard
-  BLACK = 0
-  WHITE = 1
-  RED = 2
-  GREEN = 3
-  GRAY = 4
-
-  def initialize
-    @past = []
-
-    @adapter = AQTAdapter.alloc.init
-    @adapter.openPlotWithIndex 1
-    @adapter.setPlotSize([122,122])
-    @adapter.setPlotTitle("Autotest Status")
-
-    @adapter.setColormapEntry_red_green_blue(0, 0.0, 0.0, 0.0) # black
-    @adapter.setColormapEntry_red_green_blue(1, 1.0, 1.0, 1.0) # white
-    @adapter.setColormapEntry_red_green_blue(2, 1.0, 0.0, 0.0) # red
-    @adapter.setColormapEntry_red_green_blue(3, 0.0, 1.0, 0.0) # green
-    @adapter.setColormapEntry_red_green_blue(4, 0.7, 0.7, 0.7) # gray
-
-    draw
-  end
-
-  def draw
-#    @past = @past[10..-1] if @past.size >= 100
-    @past.shift if @past.size > 100
-
-    @adapter.takeColorFromColormapEntry(@past.last ? GREEN : RED)
-    @adapter.addFilledRect([0, 0, 122, 122])
-
-    @adapter.takeColorFromColormapEntry(BLACK)
-    @adapter.addFilledRect([10, 10, 102, 102])
-
-    @adapter.takeColorFromColormapEntry(GRAY)
-    @adapter.addFilledRect([11, 11, 100, 100])
-
-    @adapter.takeColorFromColormapEntry(0)
-
-    @past.each_with_index do |passed,i|
-      x = i % 10
-      y = i / 10
-      
-      @adapter.takeColorFromColormapEntry(passed ? GREEN : RED)
-      @adapter.addFilledRect([x*10+11, y*10+11, 10, 10])
-    end
-    @adapter.renderPlot
-  end
-
-  def pass
-    @past.push true
-    draw
-  end
-
-  def fail
-    @past.push false
-    draw
-  end
-
-  def close
-    @adapter.closePlot
-  end
-end
-
-unless $TESTING then
-  board = StatusBoard.new
-
-  Autotest.add_hook :red do |at|
-    board.fail unless $TESTING
-  end
-
-  Autotest.add_hook :green do |at|
-    board.pass unless $TESTING
-  end
-end
+# require 'autotest/growl'
+# require 'autotest/html_report'
+# require 'autotest/kdenotify'
+# require 'autotest/menu'
+# require 'autotest/pretty'
+# require 'autotest/redgreen'
+# require 'autotest/snarl'
+# require 'autotest/timestamp'

data/lib/autotest.rb

@@ -62,15 +62,16 @@ class Autotest
     new.run
   end
 
-  attr_accessor :exceptions, :files, :files_to_test, :interrupted, :last_mtime, :libs, :output, :tainted
+  attr_accessor :exceptions, :files, :files_to_test, :interrupted, :last_mtime, :libs, :output, :results, :tainted, :wants_to_quit
 
   def initialize
     @files = Hash.new Time.at(0)
     @files_to_test = Hash.new { |h,k| h[k] = [] }
     @exceptions = false
-    @libs = '.:lib:test'
+    @libs = %w[. lib test].join(File::PATH_SEPARATOR)
     @output = $stderr
-    @sleep = 2
+    @sleep = 1
+    hook :initialize
   end
 
   def run
@@ -88,7 +89,6 @@ class Autotest
           break
         else
           reset
-          hook :interrupt
         end
       end
     end
@@ -123,9 +123,11 @@ class Autotest
       if @interrupted then
         @wants_to_quit = true
       else
-        puts "Interrupt a second time to quit"
-        @interrupted = true
-        sleep 1.5
+        unless hook :interrupt then
+          puts "Interrupt a second time to quit"
+          @interrupted = true
+          sleep 1.5
+        end
         raise Interrupt                 # let the run loop catch it
       end
     end
@@ -139,6 +141,7 @@ class Autotest
     filters = Hash.new { |h,k| h[k] = [] }
 
     failed.each do |method, klass|
+      klass = klass.split(/::/).last
       failed_file_name = klass.gsub(/(.)([A-Z])/, '\1_?\2')
       failed_files = @files.keys.grep(/#{failed_file_name}/i)
       case failed_files.size
@@ -167,23 +170,25 @@ class Autotest
 
       filename = f.sub(/^\.\//, '')
 
-      result[filename] = File.stat(filename).mtime
+      result[filename] = File.stat(filename).mtime rescue next
     end
     return result
   end
 
   def find_files_to_test(files=find_files)
-    updated = []
+    updated = files.select { |filename, mtime|
+      @files[filename] < mtime
+    }
 
     # TODO: keep an mtime at app level and drop the files hash
-    files.each do |filename, mtime|
-      next if @files[filename] >= mtime
+    updated.each do |filename, mtime|
+      @files[filename] = mtime
+    end
 
+    updated.each do |filename, mtime|
       tests_for_file(filename).each do |f|
         @files_to_test[f] # creates key with default value
       end
-
-      @files[filename] = mtime
     end
 
     previous = @last_mtime
@@ -261,6 +266,7 @@ class Autotest
   end
 
   def wait_for_changes
+    hook :waiting
     begin
       sleep @sleep
     end until find_files_to_test
@@ -270,8 +276,8 @@ class Autotest
   # Hooks:
 
   def hook(name)
-    HOOKS[name].each do |plugin|
-      plugin[self]
+    HOOKS[name].inject(false) do |handled,plugin|
+      plugin[self] || handled
     end
   end
 
@@ -284,6 +290,4 @@ if test ?f, './.autotest' then
   load './.autotest'
 elsif test ?f, File.expand_path('~/.autotest') then
   load File.expand_path('~/.autotest')
-else
-  puts "couldn't find ./.autotest in #{Dir.pwd}"
 end

data/lib/autotest/growl.rb

@@ -0,0 +1,35 @@
+# -*- mode -*-
+
+module Autotest::Growl
+  def self.growl title, msg, pri=0
+    system "growlnotify -n autotest --image /Applications/Mail.app/Contents/Resources/Caution.tiff -p #{pri} -m #{msg.inspect} #{title}"
+  end
+
+  Autotest.add_hook :run do  |at|
+    growl "Run", "Run" unless $TESTING
+  end
+
+  Autotest.add_hook :red do |at|
+    growl "Tests Failed", "#{at.files_to_test.size} tests failed", 2
+  end
+
+  Autotest.add_hook :green do |at|
+    growl "Tests Passed", "All tests passed", -2 if at.tainted 
+  end
+
+  Autotest.add_hook :init do |at|
+    growl "autotest", "autotest was started" unless $TESTING
+  end
+
+  Autotest.add_hook :interrupt do |at|
+    growl "autotest", "autotest was reset" unless $TESTING
+  end
+
+  Autotest.add_hook :quit do |at|
+    growl "autotest", "autotest is exiting" unless $TESTING
+  end
+
+  Autotest.add_hook :all do |at|_hook
+    growl "autotest", "Tests have fully passed", -2 unless $TESTING
+  end
+end

data/lib/autotest/html_report.rb

@@ -0,0 +1,31 @@
+# -*- mode -*-
+
+module Autotest::HtmlConsole
+  MAX = 30
+  STATUS = {}
+  PATH = File.expand_path("~/Sites/autotest.html")
+
+  def self.update
+    STATUS.delete STATUS.keys.sort.last if STATUS.size > MAX
+    File.open(PATH, "w") do |f|
+      f.puts "<title>Autotest Status</title>"
+      STATUS.sort.reverse.each do |t,s|
+        if s > 0 then
+          f.puts "<p style=\"color:red\">#{t}: #{s}"
+        else
+          f.puts "<p style=\"color:green\">#{t}: #{s}"
+        end
+      end
+    end
+  end
+
+  Autotest.add_hook :red do |at|
+    STATUS[Time.now] = at.files_to_test.size
+    update
+  end
+
+  Autotest.add_hook :green do |at|
+    STATUS[Time.now] = 0
+    update
+  end
+end

data/lib/autotest/kdenotify.rb

@@ -0,0 +1,14 @@
+# -*- ruby -*-
+
+# stolen (with permission) from http://www.snailbyte.com/2006/08/24/rails-autotest-growl-notification-using-dcop-and-knotify
+
+module Autotest::KDENotify
+  def self.knotify title, msg
+    system "dcop knotify default notify " +
+           "eventname \'#{title}\' \'#{msg}\' '' '' 16 2"
+  end
+
+  Autotest.add_hook :red do |at|
+    knotify "Tests failed", "#{at.files_to_test.size} tests failed"
+  end
+end

data/lib/autotest/menu.rb

@@ -0,0 +1,51 @@
+#!/usr/local/bin/ruby -w
+
+module Autotest::Menu
+  WINDOZE = /win32/ =~ RUBY_PLATFORM unless defined? WINDOZE
+
+  if WINDOZE then
+    require "Win32API"
+    def self.getchar
+      Win32API.new("crtdll", "_getch", [], "L").Call
+    end
+  else
+    STTY_SAVE_STATE=`stty -g`
+    def self.getchar
+      system 'stty raw echo'
+      STDIN.getc
+    ensure
+      system "stty '#{STTY_SAVE_STATE}'"
+    end
+  end
+
+  def self.menu(choices)
+    result = nil
+    choices.sort.each do |c, desc|
+      puts "#{c.chr}: #{desc}"
+    end
+    until choices[result]
+      print "menu> "
+      result = getchar
+      print " invalid input" unless choices[result]
+      puts
+    end
+    result
+  end
+
+  Autotest.add_hook(:interrupt) do |at|
+    $stderr.puts "menu"
+    case menu ?q => "quit", ?c => "continue", ?r => "restart"
+    when ?c
+      true
+    when ?r
+      at.reset
+      true
+    when ?q
+      at.wants_to_quit = true
+      true
+    else
+      false
+    end
+    # puts "you chose #{c.chr}"
+  end
+end

data/lib/autotest/pretty.rb

@@ -0,0 +1,83 @@
+# -*- ruby -*-
+
+require 'osx/cocoa'
+include Math
+include OSX
+
+OSX::NSBundle.bundleWithPath(File.expand_path("~/Library/Frameworks/Aquaterm.framework")).load
+OSX.ns_import :AQTAdapter
+
+class Autotest::Pretty
+  BLACK = 0
+  WHITE = 1
+  RED = 2
+  GREEN = 3
+  GRAY = 4
+
+  def initialize
+    @past = []
+
+    @adapter = AQTAdapter.alloc.init
+    @adapter.openPlotWithIndex 1
+    @adapter.setPlotSize([122,122])
+    @adapter.setPlotTitle("Autotest Status")
+
+    @adapter.setColormapEntry_red_green_blue(0, 0.0, 0.0, 0.0) # black
+    @adapter.setColormapEntry_red_green_blue(1, 1.0, 1.0, 1.0) # white
+    @adapter.setColormapEntry_red_green_blue(2, 1.0, 0.0, 0.0) # red
+    @adapter.setColormapEntry_red_green_blue(3, 0.0, 1.0, 0.0) # green
+    @adapter.setColormapEntry_red_green_blue(4, 0.7, 0.7, 0.7) # gray
+
+    draw
+  end
+
+  def draw
+    @past.shift if @past.size > 100
+
+    @adapter.takeColorFromColormapEntry(@past.last ? GREEN : RED)
+    @adapter.addFilledRect([0, 0, 122, 122])
+
+    @adapter.takeColorFromColormapEntry(BLACK)
+    @adapter.addFilledRect([10, 10, 102, 102])
+
+    @adapter.takeColorFromColormapEntry(GRAY)
+    @adapter.addFilledRect([11, 11, 100, 100])
+
+    @adapter.takeColorFromColormapEntry(0)
+
+    @past.each_with_index do |passed,i|
+      x = i % 10
+      y = i / 10
+      
+      @adapter.takeColorFromColormapEntry(passed ? GREEN : RED)
+      @adapter.addFilledRect([x*10+11, y*10+11, 10, 10])
+    end
+    @adapter.renderPlot
+  end
+
+  def pass
+    @past.push true
+    draw
+  end
+
+  def fail
+    @past.push false
+    draw
+  end
+
+  def close
+    @adapter.closePlot
+  end
+end
+
+unless $TESTING then
+  board = Autotest::Pretty.new
+
+  Autotest.add_hook :red do |at|
+    board.fail unless $TESTING
+  end
+
+  Autotest.add_hook :green do |at|
+    board.pass unless $TESTING
+  end
+end

data/lib/autotest/redgreen.rb

@@ -0,0 +1,13 @@
+# -*- ruby -*-
+
+# special thanks to Pat Eyler, Sean Carley, and Rob Sanheim
+module Autotest::RedGreen
+  BAR = "=" * 80
+
+  Autotest.add_hook :ran_command do |at|
+    at.results.gsub!(/^.* (\d+) failures, (\d+) errors$/) { |match|
+      code = ($1 != "0" or $2 != "0") ? 31 : 32
+      "\e[#{code}m#{BAR}\n#{match}\e[0m\n\n"
+    }
+  end
+end

data/lib/autotest/snarl.rb

@@ -0,0 +1,51 @@
+# special thanks to: Patrick Hurley <phurley@gmail.com>
+# requires the ruby-snarl gem.
+
+begin require 'rubygems'; rescue LoadError; end
+require 'snarl'
+
+module Autotest::Snarl  
+  def self.icon
+    # icons from http://www.famfamfam.com/lab/icons/silk/
+    path = File.join(File.dirname(__FILE__), "/../icons")
+    {
+      :green => "#{path}/accept.png",
+      :red    => "#{path}/exclamation.png",
+      :info   => "#{path}/information.png"
+    }
+  end
+  
+  def self.snarl title, msg, ico = nil
+    Snarl.show_message(title, msg, icon[ico])
+  end
+
+  Autotest.add_hook :run do  |at|
+    snarl "Run", "Run" unless $TESTING
+  end
+
+  Autotest.add_hook :red do |at|
+    failed_tests = at.files_to_test.inject(0){ |s,a| k,v = a;  s + v.size}
+    snarl "Tests Failed", "#{failed_tests} tests failed", :red
+  end
+
+  Autotest.add_hook :green do |at|
+    snarl "Tests Passed", "All tests passed", :green #if at.tainted 
+  end
+
+  Autotest.add_hook :run do |at|
+    snarl "autotest", "autotest was started", :info unless $TESTING
+  end
+
+  Autotest.add_hook :interrupt do |at|
+    snarl "autotest", "autotest was reset", :info unless $TESTING
+  end
+
+  Autotest.add_hook :quit do |at|
+    snarl "autotest", "autotest is exiting", :info unless $TESTING
+  end
+
+  Autotest.add_hook :all do |at|_hook
+    snarl "autotest", "Tests have fully passed", :green unless $TESTING
+  end
+
+end

data/lib/autotest/timestamp.rb

@@ -0,0 +1,7 @@
+# -*- ruby -*-
+
+module Autotest::Timestamp
+  Autotest.add_hook :waiting do |at|
+    puts "# waiting... #{Time.now}"
+  end
+end

data/lib/rails_autotest.rb

@@ -15,13 +15,7 @@ class RailsAutotest < Autotest
        "test/controllers/#{$1}_controller_test.rb",
        "test/views/#{$1}_view_test.rb",
        "test/functional/#{$1}_controller_test.rb"]
-    when %r%^test/unit/.*rb$% then
-      [filename]
-    when %r%^test/controllers/.*\.rb$% then
-      [filename]
-    when %r%^test/views/.*\.rb$% then
-      [filename]
-    when %r%^test/functional/.*\.rb$% then
+    when %r%^test/(unit|integration|controllers|views|functional)/.*rb$% then
       [filename]
     when %r%^app/models/(.*)\.rb$% then
       ["test/unit/#{$1}_test.rb"]
@@ -29,10 +23,10 @@ class RailsAutotest < Autotest
       @files.keys.select { |f|
         f =~ %r%^test/(views|functional)/.*_test\.rb$%
       }
-    when %r%^app/helpers/(.*)_helper.rb% then
+    when %r%^app/helpers/(.*)_helper.rb%, %r%^app/views/(.*)/% then
       ["test/views/#{$1}_view_test.rb",
        "test/functional/#{$1}_controller_test.rb"]
-    when %r%^app/controllers/application.rb$% then
+    when %r%^app/controllers/application.rb$% then # FIX: wtf?
       ["test/controllers/dummy_controller_test.rb",
        "test/functional/dummy_controller_test.rb"]
     when %r%^app/controllers/(.*)\.rb$% then
@@ -40,9 +34,6 @@ class RailsAutotest < Autotest
        "test/functional/#{$1}_test.rb"]
     when %r%^app/views/layouts/% then
       ["test/views/layouts_view_test.rb"]
-    when %r%^app/views/(.*)/% then
-      ["test/views/#{$1}_view_test.rb",
-       "test/functional/#{$1}_controller_test.rb"]
     when %r%^config/routes.rb$% then
       @files.keys.select do |f|
         f =~ %r%^test/(controllers|views|functional)/.*_test\.rb$%

data/lib/test/rails/functional_test_case.rb

@@ -11,6 +11,10 @@ class Test::Rails::FunctionalTestCase < Test::Rails::TestCase
   # controller class to instantiate.
   #
   # setup also instantiates a new @request and @response object.
+  #
+  # If you need to perform extra setup actions, define #setup_extra and
+  # FunctionalTestCase will call it after performing the rest of its setup
+  # actions.
 
   def setup
     return if self.class.name =~ /TestCase$/
@@ -29,6 +33,8 @@ class Test::Rails::FunctionalTestCase < Test::Rails::TestCase
     @request.session = @session
 
     @response = ActionController::TestResponse.new
+
+    setup_extra if respond_to? :setup_extra
   end
 
   ##

data/lib/test/rails/rake_tasks.rb

@@ -29,15 +29,15 @@ dirs = [
   %w[Libraries          lib/],
   %w[Models             app/models],
   %w[Unit\ tests        test/unit],
+  %w[Helpers            app/helpers],
+  %w[Helper\ tests      test/helpers],
   %w[Components         components],
   %w[Controllers        app/controllers],
   %w[Controller\ tests  test/controllers],
-  %w[Helper\ tests      test/helpers],
   %w[View\ tests        test/views],
   %w[Functional\ tests  test/functional],
   %w[Integration\ tests test/integration],
   %w[APIs               app/apis],
-  %w[Helpers            app/helpers],
 ]
 
 dirs = dirs.map { |name, dir| [name, File.join(RAILS_ROOT, dir)] }

data/lib/test/rails/render_tree.rb

@@ -0,0 +1,89 @@
+##
+# test/rails/render_tree.rb adds debug rendering to ActionView::Base#render.
+#
+# Debug rendering prints out a tree of calls to render allowing you to easily
+# visualize where rendering occurs in unfamiliar code.
+
+class ActionView::Base
+
+  alias plain_render render # :nodoc:
+
+  ##
+  # List of render types for ActionView::Base#render
+
+  RENDERS = [:partial, :template, :file, :action, :text, :inline, :nothing,
+             :update]
+
+  ##
+  # Add debug output to rendering.
+  #
+  # When you include lib/rails/render_tree a tree of renders will be displayed
+  # in the console.  This is especially useful when writing tests.
+  #
+  # This test:
+  #
+  #   require 'test/test_helper'
+  #   require 'test/rails/render_tree'
+  #   
+  #   class ThingsViewTest < Test::Rails::ViewTestCase
+  #   
+  #     fixtures :goals
+  #   
+  #     def test_body
+  #       assigns[:goal] = goals(:first)
+  #       assigns[:related_goals_moved] = []
+  #       assigns[:related_goals_instead] = []
+  #   
+  #       render :partial => 'things/body'
+  #   
+  #       assert_tag :tag => 'div', :attributes => { :id => 'entriesbucket' }
+  #     end
+  #   
+  #   end
+  #
+  # Will give this output when run:
+  #
+  #   $ ruby test/views/things_view_test.rb -n test_body
+  #   Loaded suite test/views/things_view_test
+  #   Started
+  #   "things/_body"
+  #     :partial => "widgets/goals_gallery_teaser"
+  #       "widgets/_goals_gallery_teaser"
+  #     :partial => "entries_bucket"
+  #       "things/_entries_bucket"
+  #     :partial => "things/ask_a_question"
+  #       "things/_ask_a_question"
+  #     "widgets/forms/related_goals"
+  #   .
+  #   Finished in 1.293523 seconds.
+  #   
+  #   1 tests, 1 assertions, 0 failures, 0 errors
+
+  def render(*args)
+    @level ||= 0
+
+    print '  ' * @level
+
+    case args.first
+    when String then
+      p args.first
+    when Hash then
+      hash = args.first
+      found = hash.keys & RENDERS
+      if found.length == 1 then
+        puts "%p => %p" % [found.first, hash[found.first]]
+      else
+        raise "Dunno: %p" % [hash]
+      end
+    else
+      raise "Dunno: %p" % [args]
+    end
+
+    @level += 1
+    result = plain_render(*args)
+    @level -= 1
+    result
+  end
+
+end
+

data/lib/test/rails/test_case.rb

@@ -5,8 +5,7 @@
 
 class Test::Rails::TestCase < Test::Unit::TestCase
 
-  def test_stupid # :nodoc:
-  end
+  undef_method :default_test
 
 end
 

data/lib/test/rails/view_test_case.rb

@@ -415,14 +415,15 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
     controller = @controller.class.name.sub('Controller', '')
     controller = controller.gsub(/([A-Z])/, '_\1'.downcase).sub('_', '')
     
+    extensions = %w(rhtml rxml mab)
+    
     while test =~ /_/ do
-      return test if File.file? "app/views/#{controller}/#{test}.rhtml"
-      return test if File.file? "app/views/#{controller}/#{test}.rxml"
+      return test if extensions.any? { |ext| File.file? "app/views/#{controller}/#{test}.#{ext}" }
+
       test = test.sub(/_[^_]+$/, '')
     end
 
-    return test if File.file? "app/views/#{controller}/#{test}.rhtml"
-    return test if File.file? "app/views/#{controller}/#{test}.rxml"
+    return test if extensions.any? { |ext| File.file? "app/views/#{controller}/#{test}.#{ext}" }
 
     flunk "Couldn't find view for test_#{orig_name}"
   end

data/lib/unit_diff.rb

@@ -73,8 +73,8 @@ end
 
 class UnitDiff
 
-  WINDOZE  = /win32/ =~ RUBY_PLATFORM
-  DIFF = (WINDOZE ? 'diff.exe' : 'diff')
+  WINDOZE  = /win32/ =~ RUBY_PLATFORM unless defined? WINDOZE
+  DIFF = (WINDOZE ? 'diff.exe' : 'diff') unless defined? DIFF
 
   ##
   # Handy wrapper for UnitDiff#unit_diff.

data/lib/zentest.rb

@@ -5,9 +5,13 @@ $:.unshift( *$I.split(/:/) ) if defined? $I and String === $I
 $r = false unless defined? $r # reverse mapping for testclass names
 
 if $r then
-  $-w = false # rails is retarded
-  $: << 'config'
-  require 'environment'
+  # all this is needed because rails is retarded
+  $-w = false
+  $: << 'test'
+  $: << 'lib'
+  require 'config/environment'
+  f = './app/controllers/application.rb'
+  require f if test ?f, f
 end
 
 $ZENTEST = true
@@ -71,7 +75,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 
   if $TESTING then
     attr_reader :missing_methods

data/test/test_autotest.rb

@@ -17,7 +17,17 @@ require 'autotest'
 #   run
 #   run_tests
 
+class Autotest
+  def self.clear_hooks
+    HOOKS.clear
+  end
+end
+
 class TestAutotest < Test::Unit::TestCase
+
+  WINDOZE = /win32/ =~ RUBY_PLATFORM unless defined? WINDOZE
+  RUBY = (WINDOZE ? 'c:\ruby\bin\ruby' : '/usr/local/bin/ruby')  unless defined? RUBY
+
   def setup
     @test_class = 'TestBlah'
     @test = 'test/test_blah.rb'
@@ -31,32 +41,6 @@ class TestAutotest < Test::Unit::TestCase
     @a.last_mtime = Time.at(2)
   end
 
-  def test_hooks
-    @a.instance_variable_set :@reset1, false
-    @a.instance_variable_set :@reset2, false
-    @a.instance_variable_set :@reset3, false
-
-    Autotest.add_hook(:reset) do |at|
-      at.instance_variable_set :@reset1, true
-    end
-
-    Autotest.add_hook(:reset) do |at|
-      at.instance_variable_set :@reset2, true
-    end
-
-    Autotest.add_hook(:reset) do |at|
-      at.instance_variable_set :@reset3, true
-    end
-
-    @a.reset
-
-    assert @a.instance_variable_get(:@reset1), "Hook1 should work on reset"
-    assert @a.instance_variable_get(:@reset2), "Hook2 should work on reset"
-    assert @a.instance_variable_get(:@reset3), "Hook3 should work on reset"
-  end
-
-  # TODO BUG /usr/local/bin/ruby -I.:lib:test test/test_rails_autotest.rb -n "/^(test_hooks)$/" | unit_diff -u; /usr/local/bin/ruby -I.:lib:test test/test_autotest.rb -n "/^(test_hooks|test_hooks)$/" | unit_diff -u
-
   def test_consolidate_failures_experiment
     @a.files.clear
     @a.files['lib/autotest.rb'] = Time.at(1)
@@ -91,6 +75,19 @@ class TestAutotest < Test::Unit::TestCase
     assert_equal expected, @a.output.string
   end
 
+  def test_consolidate_failures_nested_classes
+    @a.files.clear
+    @a.files['lib/outer/inner.rb'] = Time.at(5)
+    @a.files['test/outer/test_inner.rb'] = Time.at(5)
+    @a.files['lib/outer.rb'] = Time.at(5)
+    @a.files['test/test_outer.rb'] = Time.at(5)
+    result = @a.consolidate_failures([['test_blah1', "TestOuter::TestInner"]])
+    expected = {'test/outer/test_inner.rb' => ['test_blah1']}
+    assert_equal expected, result
+    expected = ""
+    assert_equal expected, @a.output.string
+  end
+
   def test_consolidate_failures_red
     result = @a.consolidate_failures([['test_blah1', @test_class], ['test_blah2', @test_class]])
     expected = {@test => ['test_blah1', 'test_blah2']}
@@ -116,10 +113,6 @@ class TestAutotest < Test::Unit::TestCase
     assert_equal "Dunno! fooby.rb\n", @a.output.string
   end
 
-  def test_flunk
-    flunk
-  end
-
   def test_find_files_to_test_lib
     # ensure we add test_blah.rb when blah.rb updates
     util_find_files_to_test(@impl, @test => [])
@@ -186,14 +179,58 @@ test_error2(TestAutotest):
     assert_equal empty, @a.files_to_test
   end
 
+  # TODO BUG /usr/local/bin/ruby -I.:lib:test test/test_rails_autotest.rb -n "/^(test_hooks)$/" | unit_diff -u; /usr/local/bin/ruby -I.:lib:test test/test_autotest.rb -n "/^(test_hooks|test_hooks)$/" | unit_diff -u
+
+  # TODO BUG /usr/local/bin/ruby -I.:lib:test test/test_rails_autotest.rb -n "/^(test_hook|test_hooks)$/" | unit_diff -u; /usr/local/bin/ruby -I.:lib:test test/test_autotest.rb -n "/^(test_hooks|test_hooks)$/" | unit_diff -u
+
+  def test_hook_overlap
+    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
+    end
+
+    Autotest.add_hook(:blah) do |at|
+      at.instance_variable_set :@blah2, true
+    end
+
+    Autotest.add_hook(:blah) do |at|
+      at.instance_variable_set :@blah3, true
+    end
+
+    @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"
+  end
+
+  def test_hook_response
+    Autotest.clear_hooks
+    assert ! @a.hook(:blah)
+
+    Autotest.add_hook(:blah) { false }
+    assert ! @a.hook(:blah)
+
+    Autotest.add_hook(:blah) { false }
+    assert ! @a.hook(:blah)
+    
+    Autotest.add_hook(:blah) { true  }
+    assert @a.hook(:blah)
+  end
+
   def test_make_test_cmd
-    ruby_cmd = Config::CONFIG['ruby_install_name']
     f = {
       @test => [],
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
     }
-    expected = [ "/usr/local/bin/#{ruby_cmd} -I.:lib:test -rtest/unit -e \"%w[#{@test}].each { |f| load f }\" | unit_diff -u",
-                 "/usr/local/bin/#{ruby_cmd} -I.:lib:test test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
+
+    expected = [ "#{RUBY} -I.:lib:test -rtest/unit -e \"%w[#{@test}].each { |f| load f }\" | unit_diff -u",
+                 "#{RUBY} -I.:lib:test test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
 
     result = @a.make_test_cmd f
     assert_equal expected, result
@@ -204,9 +241,17 @@ test_error2(TestAutotest):
     assert_equal [@test], @a.tests_for_file(@test)
 
     assert_equal ['test/test_unknown.rb'], @a.tests_for_file('test/test_unknown.rb')
+#    assert_equal [], @a.tests_for_file('test/test_unknown.rb')
     assert_equal [], @a.tests_for_file('lib/unknown.rb')
     assert_equal [], @a.tests_for_file('unknown.rb')
     assert_equal [], @a.tests_for_file('test_unknown.rb')
+
+#     @a.files.clear
+#     @a.files["blah.rb"] = Time.at(1)
+#     @a.files["test_blah.rb"] = Time.at(2)
+#     @a.last_mtime = Time.at(2)
+#    assert_equal ["test_blah.rb"], @a.tests_for_file("test_blah.rb")
+#    assert_equal ["test_blah.rb"], @a.tests_for_file("blah.rb")
   end
 
   def util_find_files_to_test(f, expected)

data/test/test_rails_autotest.rb

@@ -54,6 +54,8 @@ class TestRailsAutotest < TestAutotest
   def test_consolidate_failures_multiple_matches
     @test2 = 'test/unit/route_again_test.rb'
     @a.files[@test2] = Time.at(42)
+    @a.files['app/views/routes/edit.rhtml'] = Time.at(42)
+    @a.files['app/views/routes/list.rhtml'] = Time.at(42)
     result = @a.consolidate_failures([['test_unmatched', @test_class]])
     expected = {"test/unit/route_test.rb"=>["test_unmatched"]}
     assert_equal expected, result

data/test/test_zentest.rb

@@ -5,10 +5,7 @@ require 'test/unit' unless defined? $ZENTEST and $ZENTEST
 $TESTING = true
 
 # I do this so I can still run ZenTest against the tests and itself...
-#if __FILE__ == $0 then
-  puts "Requiring ZenTest"
-  require 'ZenTest'
-#end
+require 'ZenTest' unless defined? $ZENTEST
 
 # These are just classes set up for quick testing.
 # TODO: need to test a compound class name Mod::Cls
@@ -136,9 +133,7 @@ class MyClass8
   def MyClass8.foobaz; end
 end
 
-class TestTrueClass
-
-end
+class TestTrueClass; end
 
 class TestZenTest < Test::Unit::TestCase
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11.15
 specification_version: 1
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.3.0
-date: 2006-07-28 00:00:00 -07:00
+  version: 3.4.0
+date: 2006-09-12 00:00:00 -07:00
 summary: |-
   ZenTest can also be used to evaluate generated code and execute your
   tests, allowing for very rapid development of both tests and
@@ -73,6 +73,14 @@ files:
 - example2.rb
 - example_dot_autotest.rb
 - lib/autotest.rb
+- lib/autotest/growl.rb
+- lib/autotest/html_report.rb
+- lib/autotest/kdenotify.rb
+- lib/autotest/menu.rb
+- lib/autotest/pretty.rb
+- lib/autotest/redgreen.rb
+- lib/autotest/snarl.rb
+- lib/autotest/timestamp.rb
 - lib/rails_autotest.rb
 - lib/ruby_fork.rb
 - lib/test/rails.rb
@@ -82,6 +90,7 @@ files:
 - lib/test/rails/ivar_proxy.rb
 - lib/test/rails/pp_html_document.rb
 - lib/test/rails/rake_tasks.rb
+- lib/test/rails/render_tree.rb
 - lib/test/rails/test_case.rb
 - lib/test/rails/view_test_case.rb
 - lib/test/zentest_assertions.rb