ZenTest 3.2.0 → 3.3.0

data/lib/rails_autotest.rb

@@ -1,10 +1,5 @@
 require 'autotest'
 
-##
-# RailsAutotest is an Autotest subclass designed for use with Rails projects.
-#
-# To use RailsAutotest pass the -rails flag to autotest.
-
 class RailsAutotest < Autotest
 
   def initialize # :nodoc:
@@ -12,112 +7,55 @@ class RailsAutotest < Autotest
     @exceptions = %r%^\./(?:db|doc|log|public|script|vendor/rails)%
   end
 
-  def map_file_names(updated) # :nodoc:
-    model_tests = []
-    controller_tests = []
-    view_tests = []
-    functional_tests = []
-
-    updated.each do |filename|
-      filename.sub!(/^\.\//, '') # trim the ./ that Find gives us
-
-      case filename
-      when %r%^test/fixtures/(.*)s.yml% then
-        model_tests << "test/unit/#{$1}_test.rb"
-        controller_tests << "test/controllers/#{$1}_controller_test.rb"
-        view_tests << "test/views/#{$1}_view_test.rb"
-        functional_tests << "test/functional/#{$1}_controller_test.rb"
-      when %r%^test/unit/.*rb$% then
-        model_tests << filename
-      when %r%^app/models/(.*)\.rb$% then
-        test_file = "test/unit/#{$1}_test.rb"
-        model_tests << test_file
-      when %r%^test/controllers/.*\.rb$% then
-        controller_tests << filename
-      when %r%^test/views/.*\.rb$% then
-        view_tests << filename
-      when %r%^test/functional/.*\.rb$% then
-        functional_tests << filename
-      when %r%^app/helpers/application_helper.rb% then
-        view_test_files = @files.keys.select do |f|
-          f =~ %r%^test/views/.*_test\.rb$%
-        end
-        functional_test_files = @files.keys.select do |f|
-          f =~ %r%^test/functional/.*_test\.rb$%
-        end
-        view_tests.push(*view_test_files.sort)
-        functional_tests.push(*functional_test_files.sort)
-      when %r%^app/helpers/(.*)_helper.rb% then
-        view_test_file = "test/views/#{$1}_view_test.rb"
-        view_tests << view_test_file
-        functional_test_file = "test/functional/#{$1}_controller_test.rb"
-        functional_tests << functional_test_file
-      when %r%^app/controllers/application.rb$% then
-        controller_test_file = "test/controllers/dummy_controller_test.rb"
-        controller_tests << controller_test_file
-        functional_test_file = "test/functional/dummy_controller_test.rb"
-        functional_tests << functional_test_file
-      when %r%^app/controllers/(.*)\.rb$% then
-        controller_test_file = "test/controllers/#{$1}_test.rb"
-        controller_tests << controller_test_file
-        functional_test_file = "test/functional/#{$1}_test.rb"
-        functional_tests << functional_test_file
-      when %r%^app/views/layouts/% then
-        view_test_file = "test/views/layouts_view_test.rb"
-        view_tests << view_test_file
-      when %r%^app/views/(.*)/% then
-        view_test_file = "test/views/#{$1}_view_test.rb"
-        view_tests << view_test_file
-        functional_test_file = "test/functional/#{$1}_controller_test.rb"
-        functional_tests << functional_test_file
-      when %r%^config/routes.rb$% then
-        functional_test_files = @files.keys.select do |f|
-          f =~ %r%^test/functional/.*_test\.rb$%
-        end
-        controller_test_files = @files.keys.select do |f|
-          f =~ %r%^test/controllers/.*_test\.rb$%
-        end
-        view_test_files = @files.keys.select do |f|
-          f =~ %r%^test/views/.*_test\.rb$%
-        end
-        controller_tests.push(*controller_test_files.sort)
-        view_tests.push(*view_test_files.sort)
-        functional_tests.push(*functional_test_files.sort)
-      when %r%^test/test_helper.rb$%,
-           %r%^config/boot.rb%,
-           %r%^config/database.yml%,
-           %r%^config/environment.rb%,
-           %r%^config/environments/test.rb% then
-        model_test_files = @files.keys.select do |f|
-          f =~ %r%^test/unit/.*_test\.rb$%
-        end
-        controller_test_files = @files.keys.select do |f|
-          f =~ %r%^test/controllers/.*_test\.rb$%
-        end
-        view_test_files = @files.keys.select do |f|
-          f =~ %r%^test/views/.*_test\.rb$%
-        end
-        functional_test_files = @files.keys.select do |f|
-          f =~ %r%^test/functional/.*_test\.rb$%
-        end
-        model_tests.push(*model_test_files.sort)
-        controller_tests.push(*controller_test_files.sort)
-        view_tests.push(*view_test_files.sort)
-        functional_tests.push(*functional_test_files.sort)
-      when %r%^vendor/%, /^Rakefile$/ then
-        # ignore standard rails files
-      else
-        STDERR.puts "Dunno! #{filename}" if $v or $TESTING
+  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/.*rb$% then
+      [filename]
+    when %r%^test/controllers/.*\.rb$% then
+      [filename]
+    when %r%^test/views/.*\.rb$% then
+      [filename]
+    when %r%^test/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% then
+      ["test/views/#{$1}_view_test.rb",
+       "test/functional/#{$1}_controller_test.rb"]
+    when %r%^app/controllers/application.rb$% then
+      ["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%^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$%
       end
-    end
-
-    model_tests = model_tests.uniq.select { |f| @files.has_key? f }
-    controller_tests = controller_tests.uniq.select { |f| @files.has_key? f }
-    view_tests = view_tests.uniq.select { |f| @files.has_key? f }
-    functional_tests = functional_tests.uniq.select { |f| @files.has_key? f }
-
-    return model_tests, controller_tests, view_tests, functional_tests
+    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 }
   end
-
 end
 

data/lib/ruby_fork.rb

@@ -0,0 +1,178 @@
+require 'optparse'
+require 'socket'
+
+module RubyFork
+
+  PORT = 9084
+
+  DEFAULT_SETTINGS = {
+    :requires => [],
+    :code => [],
+    :extra_paths => [],
+    :port => PORT,
+  }
+
+  def self.add_env_args(opts, settings)
+    opts.separator ''
+    opts.separator 'Process environment options:'
+
+    opts.separator ''
+    opts.on('-e CODE', 'Execute CODE in parent process.',
+            'May be specified multiple times.') do |code|
+      settings[:code] << code
+    end
+
+    opts.separator ''
+    opts.on('-I DIRECTORY', 'Adds DIRECTORY to $LOAD_PATH.',
+            'May be specified multiple times.') do |dir|
+      settings[:extra_paths] << dir
+    end
+
+    opts.separator ''
+    opts.on('-r LIBRARY', 'Require LIBRARY in the parent process.',
+            'May be specified multiple times.') do |lib|
+      settings[:requires] << lib
+    end
+  end
+
+  def self.daemonize(io = File.open('/dev/null', 'r+'))
+    fork and exit!
+    Process.setsid
+    fork and exit!
+
+    STDIN.reopen io
+    STDOUT.reopen io
+    #STDERR.reopen io
+
+    yield if block_given?
+  end
+
+  def self.parse_client_args(args)
+    settings = Marshal.load Marshal.dump(DEFAULT_SETTINGS)
+
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: #{$0} [options]"
+
+      opts.separator ''
+      opts.on('-p', '--port PORT',
+              'Listen for connections on PORT.',
+              "Default: #{settings[:port]}") do |port|
+        settings[:port] = port.to_i
+              end
+
+      opts.separator ''
+      opts.on('-h', '--help', 'You\'re looking at it.') do
+        $stderr.puts opts
+        exit 1
+      end
+
+      add_env_args opts, settings
+    end
+
+    opts.parse! args
+
+    return settings
+  end
+
+  def self.parse_server_args(args)
+    settings = Marshal.load Marshal.dump(DEFAULT_SETTINGS)
+    settings[:daemonize] = false
+
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: #{$0} [options]"
+
+      opts.separator ''
+      opts.on('-d', '--daemonize',
+              'Run as a daemon.',
+              "Default: #{settings[:daemonize]}") do |val|
+        settings[:daemonize] = val
+      end
+
+      opts.separator ''
+      opts.on('-p', '--port PORT',
+              'Listen for connections on PORT.',
+              "Default: #{settings[:port]}") do |port|
+        settings[:port] = port.to_i
+      end
+
+      opts.separator ''
+      opts.on('-h', '--help', 'You\'re looking at it.') do
+        $stderr.puts opts
+        exit 1
+      end
+
+      add_env_args opts, settings
+    end
+
+    opts.parse! args
+
+    return settings
+  end
+
+  def self.start_client(args = ARGV)
+    trap 'INT' do exit 1 end # Exit gracefully
+
+    settings = parse_client_args args
+
+    args = Marshal.dump [settings, ARGV]
+
+    socket = TCPSocket.new 'localhost', settings[:port]
+
+    socket.puts args.length
+    socket.write args
+    socket.close_write
+
+    until socket.eof?
+      $stdout.puts socket.gets
+    end
+  end
+
+  def self.start_server(args = ARGV)
+    settings = parse_server_args args
+    setup_environment settings
+
+    daemonize if settings[:daemonize]
+
+    server = TCPServer.new 'localhost', settings[:port]
+
+    $stderr.puts "#{$0} Running as PID #{$$} on #{settings[:port]}" unless
+      settings[:daemonize]
+
+    loop do
+      Thread.new server.accept do |socket|
+        begin
+          args_length = socket.gets.to_i
+          args = socket.read args_length
+          settings, argv = Marshal.load args
+
+          fork do
+            daemonize socket do
+              ARGV.replace argv
+              setup_environment settings
+              socket.close
+            end
+          end
+
+          socket.close # close my copy.
+        rescue => e
+          socket.close if socket
+        end
+      end
+    end
+  rescue Exception => e
+    puts "Failed to catch #{e.class}:#{e.message}"
+    puts "\t#{e.backtrace.join "\n\t"}"
+  end
+
+  def self.setup_environment(settings)
+    settings[:extra_paths].map! { |dir| dir.split ':' }
+    settings[:extra_paths].flatten!
+    settings[:extra_paths].each { |dir| $:.unshift dir }
+
+    settings[:requires].each { |file| require file }
+
+    settings[:code].each { |code| eval code }
+  end
+
+end
+

data/lib/test/rails.rb

@@ -37,8 +37,7 @@ $TESTING = true
 #   require 'test/rails'
 #
 # Next, change the class from "Unit" to "Rails" right after you
-# require +test_help+. This prevents the bad things +test_help+ performs
-# upon Test::Unit::TestCase.
+# require +test_help+.
 #
 # Your 'test/test_helper.rb' will end up looking like this:
 #
@@ -262,6 +261,7 @@ require 'test/zentest_assertions'
 require 'test/rails/test_case'
 require 'test/rails/functional_test_case'
 require 'test/rails/controller_test_case'
+require 'test/rails/helper_test_case'
 require 'test/rails/ivar_proxy'
 require 'test/rails/view_test_case'
 

data/lib/test/rails/controller_test_case.rb

@@ -199,7 +199,7 @@ class Test::Rails::ControllerTestCase < Test::Rails::FunctionalTestCase
   # +params+.
 
   def xml_http_request(request_method, action, parameters = nil)
-    @request.env['REQUEST_METHOD'] = request_method
+    @request.env['REQUEST_METHOD'] = request_method.to_s
 
     @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
     @request.env['HTTP_ACCEPT'] = 'text/javascript, text/html, application/xml, text/xml, */*'

data/lib/test/rails/helper_test_case.rb

@@ -0,0 +1,60 @@
+##
+# Stub controller for testing helpers.
+
+class HelperTestCaseController < ApplicationController
+
+  attr_accessor :request
+
+  attr_accessor :url
+
+  ##
+  # Re-raise errors
+
+  def rescue_action(e)
+    raise e
+  end
+
+end
+
+##
+# HelperTestCase allows helpers to be easily tested.
+#
+# Original concept by Ryan Davis, original implementation by Geoff Grosenbach.
+
+class Test::Rails::HelperTestCase < Test::Rails::FunctionalTestCase
+
+  # Are other helpers needed?
+
+  include ActionView::Helpers::ActiveRecordHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::FormOptionsHelper
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::AssetTagHelper
+  include ActionView::Helpers::PrototypeHelper rescue nil # Rails 1.0 only
+
+  ##
+  # Automatically includes the helper module into the test sublcass.
+
+  def self.inherited(helper_testcase)
+    super
+    helper_name = helper_testcase.name.sub 'Test', ''
+    helper_module = Object.const_get helper_name
+    helper_testcase.send :include, helper_module
+  rescue NameError
+    raise "Unable to find helper #{helper_name}"
+  end
+
+  def setup
+    return if self.class.name =~ /TestCase$/
+    @controller_class_name = 'HelperTestCaseController'
+    super
+    @controller.request = @request
+    @controller.url = ActionController::UrlRewriter.new @request, {} # url_for
+    
+    ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
+  end
+
+end
+

data/lib/test/rails/pp_html_document.rb

@@ -0,0 +1,74 @@
+class HTML::Document
+  def pretty_print(q)
+    q.object_address_group self do
+      q.breakable
+      q.seplist @root.children_without_newlines do |v| q.pp v end
+    end
+  end
+end
+  
+class HTML::Node
+  def children_without_newlines
+    @children.reject do |c|
+      HTML::Text == c.class and c.content_without_whitespace == "\n"
+    end
+  end
+
+  def pretty_print(q)
+    q.group 1, '[NODE ', ']' do
+      q.breakable
+      q.seplist children_without_newlines do |v| q.pp v end
+    end
+  end
+end
+
+class HTML::Tag
+  def pretty_print(q)
+    case @closing
+    when :close then
+      q.text "[close #{@name}]"
+    when :self then
+      pretty_print_tag 'empty', q
+    when nil then
+      pretty_print_tag 'open ', q
+    else
+      raise "Unknown closing #{@closing.inspect}"
+    end
+  end
+
+  def pretty_print_tag(type, q)
+    q.group 1, "(#{type} #{@name.inspect}", ')' do
+      unless @attributes.empty? then
+        q.breakable
+        q.pp @attributes
+      end
+      unless children_without_newlines.empty? then
+        q.breakable
+        q.group 1, '[', ']' do
+          q.seplist children_without_newlines do |v|
+            q.pp v
+          end
+        end
+      end
+    end
+  end
+end
+
+class HTML::Text
+  def content_without_whitespace
+    @content.gsub(/^[ ]+/, '').sub(/[ ]+\Z/, '')
+  end
+
+  def pretty_print(q)
+    q.pp content_without_whitespace
+  end
+end
+
+class HTML::CDATA
+  def pretty_print(q)
+    q.group 1, '[', ']' do
+      q.pp @content
+    end
+  end
+end
+