ZenTest 3.4.3 → 3.5.1

data/lib/rails_autotest.rb

@@ -4,49 +4,58 @@ class RailsAutotest < Autotest
 
   def initialize # :nodoc:
     super
-    @exceptions = %r%^\./(?:db|doc|log|public|script|vendor/rails)%
+    @exceptions = /^\.\/(?:db|doc|log|public|script|tmp|vendor\/rails)/
+
+    @test_mappings = {
+      %r%^test/fixtures/(.*)s.yml% => proc { |_, m|
+        ["test/unit/#{m[1]}_test.rb",
+         "test/controllers/#{m[1]}_controller_test.rb",
+         "test/views/#{m[1]}_view_test.rb",
+         "test/functional/#{m[1]}_controller_test.rb"]
+      },
+      %r%^test/(unit|integration|controllers|views|functional)/.*rb$% => proc { |filename, _|
+        filename
+      },
+      %r%^app/models/(.*)\.rb$% => proc { |_, m|
+        ["test/unit/#{m[1]}_test.rb"]
+      },
+      %r%^app/helpers/application_helper.rb% => proc {
+        files_matching %r%^test/(views|functional)/.*_test\.rb$%
+      },
+      %r%^app/helpers/(.*)_helper.rb% => proc { |_, m|
+        if m[1] == "application" then
+          files_matching %r%^test/(views|functional)/.*_test\.rb$%
+        else
+          ["test/views/#{m[1]}_view_test.rb",
+           "test/functional/#{m[1]}_controller_test.rb"]
+        end
+      },
+      %r%^app/views/(.*)/% => proc { |_, m|
+        ["test/views/#{m[1]}_view_test.rb",
+         "test/functional/#{m[1]}_controller_test.rb"]
+      },
+      %r%^app/controllers/(.*)\.rb$% => proc { |_, m|
+        if m[1] == "application" then
+          files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+        else
+          ["test/controllers/#{m[1]}_test.rb",
+           "test/functional/#{m[1]}_test.rb"]
+        end
+      },
+      %r%^app/views/layouts/% => proc {
+        "test/views/layouts_view_test.rb"
+      },
+      %r%^config/routes.rb$% => proc { # FIX:
+        files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+      },
+      %r%^test/test_helper.rb|config/((boot|environment(s/test)?).rb|database.yml)% => proc {
+        files_matching %r%^test/(unit|controllers|views|functional)/.*_test\.rb$%
+      },
+    }
   end
 
   def tests_for_file(filename)
-
-    case filename
-    when %r%^test/fixtures/(.*)s.yml% then
-      ["test/unit/#{$1}_test.rb",
-       "test/controllers/#{$1}_controller_test.rb",
-       "test/views/#{$1}_view_test.rb",
-       "test/functional/#{$1}_controller_test.rb"]
-    when %r%^test/(unit|integration|controllers|views|functional)/.*rb$% then
-      [filename]
-    when %r%^app/models/(.*)\.rb$% then
-      ["test/unit/#{$1}_test.rb"]
-    when %r%^app/helpers/application_helper.rb% then
-      @files.keys.select { |f|
-        f =~ %r%^test/(views|functional)/.*_test\.rb$%
-      }
-    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 # FIX: wtf?
-      ["test/controllers/dummy_controller_test.rb",
-       "test/functional/dummy_controller_test.rb"]
-    when %r%^app/controllers/(.*)\.rb$% then
-      ["test/controllers/#{$1}_test.rb",
-       "test/functional/#{$1}_test.rb"]
-    when %r%^app/views/layouts/% then
-      ["test/views/layouts_view_test.rb"]
-    when %r%^config/routes.rb$% then
-      @files.keys.select do |f|
-        f =~ %r%^test/(controllers|views|functional)/.*_test\.rb$%
-      end
-    when %r%^test/test_helper.rb%,
-         %r%^config/((boot|environment(s/test)?).rb|database.yml)% then
-      @files.keys.select do |f|
-        f =~ %r%^test/(unit|controllers|views|functional)/.*_test\.rb$%
-      end
-    else
-      @output.puts "Dunno! #{filename}" if $TESTING
-      []
-    end.uniq.select { |f| @files.has_key? f }
+    super.select { |f| @files.has_key? f }
   end
 
   def path_to_classname(s)
@@ -57,4 +66,3 @@ class RailsAutotest < Autotest
     f.join('::')
   end
 end
-

data/lib/rspec_rails_autotest.rb

@@ -0,0 +1,119 @@
+# (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'autotest'
+
+class RspecRailsAutotest < Autotest
+  attr_accessor :spec_command
+
+  def initialize # :nodoc:
+    @spec_command = "spec --diff unified"
+    super
+    @exceptions = %r%^\./(?:coverage|db|doc|log|public|script|vendor)%
+  end
+
+  def tests_for_file(filename)
+    case filename
+    when %r%^spec/fixtures/(.*)s.yml% then
+      ["spec/models/#{$1}_spec.rb",
+       "spec/controllers/#{$1}_controller_spec.rb"]
+    when %r%^spec/models/.*rb$% then
+      [filename]
+    when %r%^spec/controllers/.*\.rb$% then
+      [filename]
+    # when %r%^spec/acceptance/.*\.rb$% then
+    #   [filename]
+    when %r%^app/models/(.*)\.rb$% then
+      ["spec/models/#{$1}_spec.rb"]
+    when %r%^app/helpers/application_helper.rb% then
+      @files.keys.select { |f|
+        f =~ %r%^spec/controllers/.*_spec\.rb$%
+      }
+    when %r%^app/helpers/(.*)_helper.rb% then
+      ["spec/controllers/#{$1}_controller_spec.rb"]
+    when %r%^app/controllers/application.rb$% then
+      @files.keys.select { |f|
+        f =~ %r%^spec/controllers/.*_spec\.rb$%
+      }
+    when %r%^app/controllers/(.*)\.rb$% then
+      ["spec/controllers/#{$1}_spec.rb"]
+    when %r%^app/views/layouts/% then
+      []
+    when %r%^app/views/(.*)/% then
+      ["spec/controllers/#{$1}_controller_spec.rb"]
+    when %r%^config/routes.rb$% then
+      @files.keys.select do |f|
+        f =~ %r%^spec/controllers/.*_spec\.rb$%
+      end
+    when %r%^spec/spec_helper.rb%,
+         %r%^config/((boot|environment(s/test)?).rb|database.yml)% then
+      @files.keys.select do |f|
+        f =~ %r%^spec/(models|controllers)/.*_spec\.rb$%
+      end
+    else
+      @output.puts "Dunno! #{filename}" if $TESTING
+      []
+    end.uniq.select { |f| @files.has_key? f }
+  end
+
+  def handle_results(results)
+    failed = results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+    @files_to_test = consolidate_failures failed
+    unless @files_to_test.empty? then
+      hook :red
+    else
+      hook :green
+    end unless $TESTING
+    @tainted = true unless @files_to_test.empty?
+  end
+
+  def consolidate_failures(failed)
+    filters = Hash.new { |h,k| h[k] = [] }
+    failed.each do |spec, failed_trace|
+      @files.keys.select{|f| f =~ /spec\//}.each do |f|
+        if failed_trace =~ Regexp.new(f)
+          filters[f] << spec
+          break
+        end
+      end
+    end
+    return filters
+  end
+
+  def make_test_cmd(files_to_test)
+    cmds = []
+    full, partial = files_to_test.partition { |k,v| v.empty? }
+
+    unless full.empty? then
+      classes = full.map {|k,v| k}.flatten.join(' ')
+      cmds << "#{spec_command} #{classes}"
+    end
+
+    partial.each do |klass, methods|
+      cmds.push(*methods.map { |meth|
+                  "#{spec_command} -s #{meth.inspect} #{klass}"
+                })
+    end
+
+    return cmds.join('; ')
+  end
+end

data/lib/test/rails.rb

@@ -1,7 +1,9 @@
 require 'test/unit'
+require 'rubygems/version'
 require 'test_help' # hopefully temporary, required for Test::Rails to work
                     # until we get rid of test_help so Test::Unit::TestCase
                     # is kept virgin.
+require 'rails/version' unless defined? Rails::VERSION
 
 $TESTING = true
 
@@ -249,7 +251,24 @@ $TESTING = true
 #
 # The stats target is updated to account for controller and view tests.
 
-module Test::Rails; end
+module Test::Rails
+
+  @rails_version = Gem::Version.new Rails::VERSION::STRING
+  @v1_2 = Gem::Version.new '1.2'
+
+  ##
+  # The currently loaded rails version.  Better than Rails::VERSION::STRING
+  # since this one is comparable.
+
+  def self.rails_version
+    @rails_version
+  end
+
+  def self.v1_2 # :nodoc:
+    @v1_2
+  end
+
+end
 
 class Object # :nodoc:
   def self.path2class(klassname)
@@ -265,3 +284,11 @@ require 'test/rails/helper_test_case'
 require 'test/rails/ivar_proxy'
 require 'test/rails/view_test_case'
 
+##
+# Use sensible defaults.
+
+class Test::Unit::TestCase # :nodoc:
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures  = false
+end
+

data/lib/test/rails/controller_test_case.rb

@@ -112,13 +112,31 @@
 
 class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
 
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures = false
+
   NOTHING = Object.new # :nodoc:
 
   DEFAULT_ASSIGNS = %w[
-    action_name before_filter_chain_aborted cookies flash headers
-    ignore_missing_templates loggedin_user logger params request
-    request_origin response session template template_class template_root url
-    user variables_added
+    _cookies _flash _headers _params _request _response _session
+
+    cookies flash headers params request response session
+
+    action_name
+    before_filter_chain_aborted
+    db_rt_after_render
+    db_rt_before_render
+    ignore_missing_templates
+    loggedin_user
+    logger
+    rendering_runtime
+    request_origin
+    template
+    template_class
+    template_root
+    url
+    user
+    variables_added
   ]
 
   def setup
@@ -229,7 +247,10 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
     ivar = ivar.to_s
     @assigns_asserted << ivar
     assert_includes ivar, assigns, "#{ivar.inspect} missing from assigns"
-    assert_equal value, assigns[ivar] unless value.equal? NOTHING
+    unless value.equal? NOTHING then
+      assert_equal value, assigns[ivar],
+                   "assert_assigned #{ivar.intern.inspect}"
+    end
   end
 
   ##
@@ -338,7 +359,7 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
     message = []
     message << "You are missing these assert_assigned assertions:"
     assigns_missing.sort.each do |ivar|
-      message << "    assert_assigned #{ivar.intern.inspect} #, some_value"
+      message << "    assert_assigned #{ivar.intern.inspect} #, :some_value"
     end
     message << nil # stupid '.'
 

data/lib/test/rails/functional_test_case.rb

@@ -6,6 +6,9 @@ $TESTING_RTC = defined? $TESTING_RTC
 
 class Test::Rails::FunctionalTestCase < Test::Rails::TestCase
 
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures = false
+
   ##
   # Sets up instance variables to allow tests depending on a controller work.
   #

data/lib/test/rails/helper_test_case.rb

@@ -23,6 +23,9 @@ end
 
 class Test::Rails::HelperTestCase < Test::Rails::FunctionalTestCase
 
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures = false
+
   # Are other helpers needed?
 
   include ActionView::Helpers::ActiveRecordHelper

data/lib/test/rails/view_test_case.rb

@@ -86,6 +86,9 @@
 
 class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
 
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures = false
+
   ##
   # Sets up the test case.
 
@@ -102,7 +105,6 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
     # these go here so that flash and session work as they should.
     @controller.send :initialize_template_class, @response
     @controller.send :assign_shortcuts, @request, @response
-    @controller.send :reset_session
 
     assigns[:session] = @controller.session
     @controller.class.send :public, :flash # make flash accessible to the test
@@ -172,8 +174,14 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
     defaults = { :layout => false }
     options = defaults.merge options
 
-    @controller.instance_variable_set :@params, @request.parameters
+    if Test::Rails.rails_version >= Test::Rails.v1_2 then
+      @controller.send :params=, @request.parameters
+    else
+      @controller.instance_variable_set :@params, @request.parameters
+    end
     @controller.send :initialize_current_url
+    current_url = URI.parse @controller.url_for
+    @request.request_uri = current_url.request_uri
 
     # Rails 1.0
     @controller.send :assign_names rescue nil
@@ -467,9 +475,9 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   def action_name(test)
     orig_name = test = test.sub(/.*in `test_(.*)'/, '\1')
     controller = @controller.class.name.sub('Controller', '').underscore
-    
-    extensions = %w(rhtml rxml mab)
-    
+
+    extensions = %w[rhtml rxml rjs mab]
+
     while test =~ /_/ do
       return test if extensions.any? { |ext| File.file? "app/views/#{controller}/#{test}.#{ext}" }
 

data/lib/test/zentest_assertions.rb

@@ -4,25 +4,44 @@
 module Test::Unit::Assertions
 
   ##
-  # Asserts that +boolean+ is not false or nil.
+  # Asserts that +obj+ responds to #empty? and #empty? returns true.
 
-  def deny(boolean, message = nil)
-    _wrap_assertion do
-      assert_block(build_message(message, "<?> is not false or nil.", boolean)) { not boolean }
-    end
+  def assert_empty(obj)
+    assert_respond_to obj, :empty?
+    assert_block "#{obj.inspect} expected to be empty." do obj.empty? end
   end
 
   ##
-  # Alias for assert_not_equal
+  # Like assert_in_delta but better dealing with errors proportional
+  # to the sizes of +a+ and +b+.
 
-  alias deny_equal assert_not_equal
+  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}"
+
+    assert_block message do error <= epsilon end
+  end
 
   ##
-  # Asserts that +obj+ responds to #empty? and #empty? returns true.
+  # Asserts that +obj+ responds to #include? and that obj includes +item+.
 
-  def assert_empty(obj)
-    assert_respond_to obj, :empty?
-    assert_equal true, obj.empty?
+  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
+
+  alias assert_includes assert_include
+
+  ##
+  # 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 }
+    end
   end
 
   ##
@@ -30,30 +49,30 @@ module Test::Unit::Assertions
 
   def deny_empty(obj)
     assert_respond_to obj, :empty?
-    assert_equal false, obj.empty?
+    assert_block "#{obj.inspect} expected to have stuff." do !obj.empty? end
   end
 
   ##
-  # Asserts that +obj+ is not nil.
+  # Alias for assert_not_equal
 
-  alias deny_nil assert_not_nil
+  alias deny_equal assert_not_equal
 
   ##
-  # Asserts that +obj+ responds to #include? and that obj includes +item+.
+  # Asserts that +obj+ responds to #include? and that obj does not include
+  # +item+.
 
-  def assert_includes(item, obj, message = nil)
+  def deny_include(item, obj, message = nil)
     assert_respond_to obj, :include?
-    assert_equal true, obj.include?(item), message
+    message ||= "#{obj.inspect} includes #{item.inspect}."
+    assert_block message do !obj.include? item end
   end
 
+  alias deny_includes deny_include
+
   ##
-  # Asserts that +obj+ responds to #include? and that obj does not include
-  # +item+.
+  # Asserts that +obj+ is not nil.
 
-  def deny_includes(item, obj, message = nil)
-    assert_respond_to obj, :include?
-    assert_equal false, obj.include?(item), message
-  end
+  alias deny_nil assert_not_nil
 
   ##
   # Captures $stdout and $stderr to StringIO objects and returns them.