ZenTest 3.4.1 → 3.4.2

data/History.txt

@@ -1,3 +1,17 @@
+*** 3.4.2 / 2006-11-09
+
++ 2 minor enhancements:
+	+ Add TextHelper for pluralize.
+	+ Add deny_nil to Test::Rails.
++ 7 bug fixes:
+	+ Fixed test_help's Flash. It's is a module. Oops...
+	+ Don't run util_audit_assert_assigned if tests didn't pass, results will be bogus.
+	+ Fixed AssertionsTest names to match what autotest expects.
+	+ Fixed bug where deny_includes failed for Symbol keys.
+	+ Switched autotest to use require instead of load... Why??? I don't know!!
+	+ Fixed a minor but annoying whitespace difference in unit_diff.
+	+ Switched argument order of assert_includes and deny_includes to match Test::Unit convention.
+
 *** 3.4.1 / 2006-10-13
 
 + 3 minor enhancements:

data/Manifest.txt

@@ -41,6 +41,7 @@ lib/zentest.rb
 test/test_autotest.rb
 test/test_help.rb
 test/test_rails_autotest.rb
+test/test_rails_controller_test_case.rb
 test/test_rails_helper_test_case.rb
 test/test_rails_view_test_case.rb
 test/test_ruby_fork.rb

data/Rakefile

@@ -19,11 +19,6 @@ Hoe.new("ZenTest", ZenTest::VERSION) do |p|
   p.description = description.join("\n\n")
 end
 
-desc 'Update Manifest.txt'
-task :update_manifest => :clean do
-  sh "p4 open Manifest.txt; find . -type f | sed -e 's%./%%' | sort > Manifest.txt"
-end
-
 task :autotest do
   ruby "-Ilib ./bin/autotest"
 end

data/lib/autotest.rb

@@ -216,7 +216,7 @@ class Autotest
 
     unless full.empty? then
       classes = full.map {|k,v| k}.flatten.join(' ')
-      cmds << "#{ruby} -I#{@libs} -rtest/unit -e \"%w[#{classes}].each { |f| load f }\" | unit_diff -u"
+      cmds << "#{ruby} -I#{@libs} -rtest/unit -e \"%w[#{classes}].each { |f| require f }\" | unit_diff -u"
     end
 
     partial.each do |klass, methods|

data/lib/test/rails/controller_test_case.rb

@@ -228,7 +228,7 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
   def assert_assigned(ivar, value = NOTHING)
     ivar = ivar.to_s
     @assigns_asserted << ivar
-    assert_includes assigns, ivar, "#{ivar.inspect} missing from assigns"
+    assert_includes ivar, assigns, "#{ivar.inspect} missing from assigns"
     assert_equal value, assigns[ivar] unless value.equal? NOTHING
   end
 
@@ -267,7 +267,8 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
   # Asserts that the assigns variable +ivar+ is not set.
 
   def deny_assigned(ivar)
-    deny_includes assigns, ivar
+    ivar = ivar.to_s
+    deny_includes ivar, assigns
   end
 
   ##
@@ -320,6 +321,7 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
   #   .
 
   def util_audit_assert_assigned
+    return unless @test_passed
     return unless @controller.send :performed?
     all_assigns = assigns.keys.sort
 

data/lib/test/rails/functional_test_case.rb

@@ -1,3 +1,5 @@
+$TESTING_RTC = defined? $TESTING_RTC
+
 ##
 # FunctionalTestCase is an abstract class that sets up a controller instance
 # for its subclasses.
@@ -17,7 +19,7 @@ class Test::Rails::FunctionalTestCase < Test::Rails::TestCase
   # actions.
 
   def setup
-    return if self.class.name =~ /TestCase$/
+    return if self.class.name =~ /TestCase$/ and not $TESTING_RTC
     super
 
     @controller_class = Object.path2class @controller_class_name

data/lib/test/rails/helper_test_case.rb

@@ -33,6 +33,7 @@ class Test::Rails::HelperTestCase < Test::Rails::FunctionalTestCase
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::AssetTagHelper
   include ActionView::Helpers::PrototypeHelper rescue nil # Rails 1.0 only
+  include ActionView::Helpers::TextHelper
 
   ##
   # Automatically includes the helper module into the test sublcass.

data/lib/test/zentest_assertions.rb

@@ -33,10 +33,15 @@ module Test::Unit::Assertions
     assert_equal false, obj.empty?
   end
 
+  ##
+  # Asserts that +obj+ is not nil.
+
+  alias deny_nil assert_not_nil
+
   ##
   # Asserts that +obj+ responds to #include? and that obj includes +item+.
 
-  def assert_includes(obj, item, message = nil)
+  def assert_includes(item, obj, message = nil)
     assert_respond_to obj, :include?
     assert_equal true, obj.include?(item), message
   end
@@ -45,7 +50,7 @@ module Test::Unit::Assertions
   # Asserts that +obj+ responds to #include? and that obj does not include
   # +item+.
 
-  def deny_includes(obj, item, message = nil)
+  def deny_includes(item, obj, message = nil)
     assert_respond_to obj, :include?
     assert_equal false, obj.include?(item), message
   end

data/lib/unit_diff.rb

@@ -185,7 +185,7 @@ class UnitDiff
         if result.empty? then
           output.push "[no difference--suspect ==]"
         else
-          output.push result.map {|line| line.strip}
+          output.push result.map { |line| line.chomp }
         end
 
         output.push ''

data/lib/zentest.rb

@@ -75,7 +75,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 
   if $TESTING then
     attr_reader :missing_methods

data/test/test_autotest.rb

@@ -30,8 +30,8 @@ class TestAutotest < Test::Unit::TestCase
   def setup
     @test_class = 'TestBlah'
     @test = 'test/test_blah.rb'
+    @other_test = 'test/test_blah_other.rb'
     @impl = 'lib/blah.rb'
-    @rails = self.class.name =~ /Rails/
     @inner_test = 'test/outer/test_inner.rb'
     @outer_test = 'test/test_outer.rb'
     @inner_test_class = "TestOuter::TestInner"
@@ -62,8 +62,7 @@ class TestAutotest < Test::Unit::TestCase
   end
 
   def test_consolidate_failures_multiple_possibilities
-    f = @rails ? 'test/other_blah_test.rb' : 'test/test_blah_other.rb'
-    @a.files[f] = Time.at(42)
+    @a.files[@other_test] = Time.at(42)
     result = @a.consolidate_failures([['test_unmatched', @test_class]])
     expected = { @test => ['test_unmatched']}
     assert_equal expected, result
@@ -233,7 +232,7 @@ test_error2(#{@test_class}):
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
     }
 
-    expected = [ "#{RUBY} -I.:lib:test -rtest/unit -e \"%w[#{@test}].each { |f| load f }\" | unit_diff -u",
+    expected = [ "#{RUBY} -I.:lib:test -rtest/unit -e \"%w[#{@test}].each { |f| require 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

data/test/test_help.rb

@@ -1,3 +1,14 @@
+# ActionPack
+module ActionController; end
+module ActionController::Flash; end
+class ActionController::Flash::FlashHash; end
+class ActionController::TestSession < Hash; end
+
+class ActionController::TestRequest
+  attr_accessor :session
+end
+class ActionController::TestResponse; end
+
 class ApplicationController; end
 
 module ActionView; end
@@ -10,3 +21,10 @@ module ActionView::Helpers::FormHelper; end
 module ActionView::Helpers::UrlHelper; end
 module ActionView::Helpers::AssetTagHelper; end
 
+# ActionMailer
+
+module ActionMailer; end
+class ActionMailer::Base
+  def self.deliveries=(arg); end
+end
+

data/test/test_rails_autotest.rb

@@ -9,6 +9,7 @@ class TestRailsAutotest < TestAutotest
 
     @test_class = 'RouteTest'
     @test = 'test/unit/route_test.rb'
+    @other_test = 'test/other_blah_test.rb'
     @impl = 'app/models/route.rb'
     @inner_test = 'test/outer/inner_test.rb'
     @outer_test = 'test/outer_test.rb'

data/test/test_rails_controller_test_case.rb

@@ -0,0 +1,48 @@
+require 'test/unit'
+require 'test/zentest_assertions'
+
+$TESTING_RTC = true
+
+begin
+  require 'test/rails'
+rescue LoadError, NameError
+  $TESTING_RTC = false
+end
+
+class TRController < ApplicationController
+end if $TESTING_RTC
+
+class TestRailsControllerTestCase < Test::Rails::ControllerTestCase
+  
+  def setup
+    @controller_class_name = 'TRController'
+    super
+  end
+
+  def assigns
+    { 'ivar' => 'value' }
+  end
+
+  def test_assert_assigned
+    assert_assigned :ivar
+    assert_assigned :ivar, 'value'
+
+    assert_raise Test::Unit::AssertionFailedError do
+      assert_assigned :no_ivar
+    end
+
+    assert_raise Test::Unit::AssertionFailedError do
+      assert_assigned :ivar, 'bad_value'
+    end
+  end
+
+  def test_deny_assigned
+    deny_assigned :no_ivar
+
+    assert_raise Test::Unit::AssertionFailedError do
+      deny_assigned :ivar
+    end
+  end
+
+end if $TESTING_RTC
+

data/test/test_rails_helper_test_case.rb

@@ -1,6 +1,13 @@
 require 'test/unit'
 require 'test/zentest_assertions'
-require 'test/rails'
+
+$TESTING_RTC = true
+
+begin
+  require 'test/rails'
+rescue LoadError, NameError
+  $TESTING_RTC = false
+end
 
 begin
   module TRHelper
@@ -8,7 +15,7 @@ begin
   end
   class TRHelperTest < Test::Rails::HelperTestCase; end
 rescue RuntimeError
-end
+end if $TESTING_RTC
 
 begin
   module Widgets; end
@@ -17,23 +24,23 @@ begin
   end
   class Widgets::SomeHelperTest < Test::Rails::HelperTestCase; end
 rescue RuntimeError
-end
+end if $TESTING_RTC
 
 class TestRailsHelperTestCase < Test::Unit::TestCase
 
   def test_self_inherited
     assert defined? TRHelperTest
 
-    assert_includes TRHelperTest.instance_methods, 'tr_helper'
+    assert_includes 'tr_helper', TRHelperTest.instance_methods
   end
 
   def test_self_inherited_namespaced
     assert defined? Widgets
     assert defined? Widgets::SomeHelperTest
 
-    assert_includes Widgets::SomeHelperTest.instance_methods,
-                    'widgets_some_helper'
+    assert_includes 'widgets_some_helper',
+                    Widgets::SomeHelperTest.instance_methods
   end
 
-end
+end if $TESTING_RTC
 

data/test/test_rails_view_test_case.rb

@@ -1,6 +1,13 @@
 require 'test/unit'
 require 'test/zentest_assertions'
-require 'test/rails'
+
+$TESTING_RTC = true
+
+begin
+  require 'test/rails'
+rescue LoadError, NameError
+  $TESTING_RTC = false
+end
 
 class View; end
 
@@ -16,13 +23,13 @@ class TestRailsViewTestCase < Test::Rails::ViewTestCase
   end
 
   def test_assert_text_area
-    @request.body = <<-EOF
+    @request.body = '
 <form action="/post/save">
 <textarea id="post_body" name="post[body]">
-OMG he like hates me and he's like going out with this total skank!~ oh noes!!~
+OMG he like hates me and he\'s like going out with this total skank!~ oh noes!!~
 </textarea>
 </form>
-    EOF
+'
 
     assert_text_area '/post/save', 'post[body]'
 
@@ -50,5 +57,5 @@ OMG he like hates me and he's like going out with this total skank!~ oh noes!!~
     @assert_tag << arg
   end
 
-end
+end if $TESTING_RTC
 

data/test/test_unit_diff.rb

@@ -130,7 +130,7 @@ class TestUnitDiff < Test::Unit::TestCase
   def test_unit_diff2
     input = "Loaded suite ./blah\nStarted\nFF\nFinished in 0.035332 seconds.\n\n  1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n<\"line1\\nline2\\nline3\\n\"> expected but was\n<\"line4\\nline5\\nline6\\n\">.\n\n  2) Failure:\ntest_test2(TestBlah) [./blah.rb:29]:\n<\"line1\"> expected but was\n<\"line2\\nline3\\n\\n\">.\n\n2 tests, 2 assertions, 2 failures, 0 errors\n"
 
-    expected = "Loaded suite ./blah\nStarted\nFF\nFinished in 0.035332 seconds.\n\n1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n1,3c1,3\n< line1\n< line2\n< line3\n---\n> line4\n> line5\n> line6\n\n2) Failure:\ntest_test2(TestBlah) [./blah.rb:29]:\n1c1,4\n< line1\n---\n> line2\n> line3\n>\n>\n\n2 tests, 2 assertions, 2 failures, 0 errors"
+    expected = "Loaded suite ./blah\nStarted\nFF\nFinished in 0.035332 seconds.\n\n1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n1,3c1,3\n< line1\n< line2\n< line3\n---\n> line4\n> line5\n> line6\n\n2) Failure:\ntest_test2(TestBlah) [./blah.rb:29]:\n1c1,4\n< line1\n---\n> line2\n> line3\n> \n> \n\n2 tests, 2 assertions, 2 failures, 0 errors"
 
     assert_equal expected, @diff.unit_diff(input)
   end
@@ -154,7 +154,7 @@ class TestUnitDiff < Test::Unit::TestCase
   def test_unit_diff_NOT_suspect_equals
     input = ".\nFinished in 0.0 seconds.\n\n  1) Failure:\ntest_blah(TestBlah)\n<\"out\"> expected but was\n<\"out\\n\">.\n\n1 tests, 1 assertions, 1 failures, 0 errors"
 
-    expected = ".\nFinished in 0.0 seconds.\n\n1) Failure:\ntest_blah(TestBlah)\n1a2\n>\n\n1 tests, 1 assertions, 1 failures, 0 errors"
+    expected = ".\nFinished in 0.0 seconds.\n\n1) Failure:\ntest_blah(TestBlah)\n1a2\n> \n\n1 tests, 1 assertions, 1 failures, 0 errors"
 
     assert_equal expected, @diff.unit_diff(input)
   end

data/test/test_zentest_assertions.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'test/zentest_assertions'
 
-class AssertionsTest < Test::Unit::TestCase
+class TestZenTestAssertions < Test::Unit::TestCase
 
   def test_assert_empty
     assert_empty []
@@ -37,18 +37,26 @@ class AssertionsTest < Test::Unit::TestCase
   end
 
   def test_assert_includes
-    assert_includes [true], true
+    assert_includes true, [true]
 
     assert_raise Test::Unit::AssertionFailedError do
-      assert_includes [true], false
+      assert_includes false, [true]
     end
   end
 
   def test_deny_includes
-    deny_includes [true], false
+    deny_includes false, [true]
 
     assert_raise Test::Unit::AssertionFailedError do
-      deny_includes [true], true
+      deny_includes true, [true]
+    end
+  end
+
+  def test_deny_nil
+    deny_nil false
+
+    assert_raise Test::Unit::AssertionFailedError do
+      deny_nil nil
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.4.1
-date: 2006-10-13 00:00:00 -07:00
+  version: 3.4.2
+date: 2006-11-09 00:00:00 -05:00
 summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails."
 require_paths: 
 - lib
@@ -74,14 +74,24 @@ files:
 - test/test_autotest.rb
 - test/test_help.rb
 - test/test_rails_autotest.rb
+- test/test_rails_controller_test_case.rb
+- test/test_rails_helper_test_case.rb
+- test/test_rails_view_test_case.rb
+- test/test_ruby_fork.rb
+- test/test_unit_diff.rb
+- test/test_zentest.rb
+- test/test_zentest_assertions.rb
+test_files: 
+- test/test_autotest.rb
+- test/test_help.rb
+- test/test_rails_autotest.rb
+- test/test_rails_controller_test_case.rb
 - test/test_rails_helper_test_case.rb
 - test/test_rails_view_test_case.rb
 - test/test_ruby_fork.rb
 - test/test_unit_diff.rb
 - test/test_zentest.rb
 - test/test_zentest_assertions.rb
-test_files: []
-
 rdoc_options: []
 
 extra_rdoc_files: []
@@ -106,5 +116,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.1.3
     version: