diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-15 20:55:19 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-15 20:55:19 +0000 |
| commit | fb13b7a495c248479f77d42a55e1c3e47c78c49c (patch) | |
| tree | 988b8cd610718cf319a666dda752b99ea6d55a79 | |
| parent | c81af992e84169e7e462a99dd1f86b96eff7d345 (diff) | |
| download | rails-fb13b7a495c248479f77d42a55e1c3e47c78c49c.tar.gz rails-fb13b7a495c248479f77d42a55e1c3e47c78c49c.tar.bz2 rails-fb13b7a495c248479f77d42a55e1c3e47c78c49c.zip | |
Removed the Ruby 1.8.2 test/unit fix as it didnt work anyway
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rwxr-xr-x | actionpack/Rakefile | 2 | ||||
| -rwxr-xr-x | activerecord/Rakefile | 2 | ||||
| -rw-r--r-- | activesupport/lib/std_ext/test_unit_ext.rb | 24 | ||||
| -rwxr-xr-x | railties/fresh_rakefile | 2 |
4 files changed, 0 insertions, 30 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index b2d3f8c986..dcd91920a3 100755 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -6,8 +6,6 @@ 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 5edd39c0ad..610a5d38f1 100755 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -6,8 +6,6 @@ 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/activesupport/lib/std_ext/test_unit_ext.rb b/activesupport/lib/std_ext/test_unit_ext.rb deleted file mode 100644 index abba7f5ff8..0000000000 --- a/activesupport/lib/std_ext/test_unit_ext.rb +++ /dev/null @@ -1,24 +0,0 @@ -# Bug fix for using Ruby 1.8.2 and Rake together to run tests. -require 'test/unit' - -module Test - module Unit - module Collector - class Dir - def collect_file(name, suites, already_gathered) - dir = File.dirname(File.expand_path(name)) - $:.unshift(dir) unless $:.first == dir - if(@req) - @req.require(name) - else - require(name) - end - find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)} - rescue LoadError, SystemExit - ensure - $:.delete_at $:.rindex(dir) - end - end - end - end -end diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile index 2a4ca7098b..95daddb261 100755 --- a/railties/fresh_rakefile +++ b/railties/fresh_rakefile @@ -7,8 +7,6 @@ $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_structure_to_test, :test_units, :test_functional ] |