From 590ea2930dd3ba504c899a8e6cc41dcc290c7a47 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson <david@loudthinking.com> Date: Mon, 10 Jan 2005 00:33:03 +0000 Subject: Added inclusion of fix for test/unit and rake problems with Ruby 1.8.2 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@361 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/Rakefile | 2 ++ activerecord/Rakefile | 2 ++ activerecord/test/abstract_unit.rb | 1 - railties/fresh_rakefile | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 0f9da91b3e..c885221f10 100755 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -6,6 +6,8 @@ require 'rake/packagetask' require 'rake/gempackagetask' require 'rake/contrib/rubyforgepublisher' +require 'lib/action_controller/support/std_ext/test_unit_ext' # temporary fix until test/unit is cured for 1.8.2 + PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'actionpack' PKG_VERSION = '1.2.0' + PKG_BUILD diff --git a/activerecord/Rakefile b/activerecord/Rakefile index a82b3edf03..d5a2fbfada 100755 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -6,6 +6,8 @@ require 'rake/packagetask' require 'rake/gempackagetask' require 'rake/contrib/rubyforgepublisher' +require 'lib/active_record/support/std_ext/test_unit_ext' # temporary fix until test/unit is cured for 1.8.2 + PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'activerecord' PKG_VERSION = '1.4.0' + PKG_BUILD diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb index 67984a4609..881657fb4a 100755 --- a/activerecord/test/abstract_unit.rb +++ b/activerecord/test/abstract_unit.rb @@ -1,5 +1,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') -# $:.unshift(File.dirname(__FILE__) + '/fixtures') require 'test/unit' require 'active_record' diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile index 87263c4bff..d46c057194 100755 --- a/railties/fresh_rakefile +++ b/railties/fresh_rakefile @@ -7,6 +7,8 @@ $VERBOSE = nil require File.dirname(__FILE__) + '/config/environment' require 'code_statistics' +require 'active_record/support/std_ext/test_unit_ext' # temporary fix until test/unit is cured for 1.8.2 + desc "Run all the tests on a fresh test database" task :default => [ :clone_development_structure_to_test, :test_units, :test_functional ] -- cgit v1.2.3