diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-20 16:23:55 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-20 16:23:55 -0700 |
| commit | 205cfe2163d9eb6ee801a23f550e960136b5680e (patch) | |
| tree | e3771a7e961b15fe6bb5f95af0478cb5bf138949 | |
| parent | c86ec82cf63938f691c9ae4f5a4d72bea9e8a9c7 (diff) | |
| download | rails-205cfe2163d9eb6ee801a23f550e960136b5680e.tar.gz rails-205cfe2163d9eb6ee801a23f550e960136b5680e.tar.bz2 rails-205cfe2163d9eb6ee801a23f550e960136b5680e.zip | |
Massage setup for old tests on new base
| -rw-r--r-- | actionpack/Rakefile | 3 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/new_base/abstract_unit.rb (renamed from actionpack/test/abstract_unit2.rb) | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index f1f407c008..af14e592c0 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -57,8 +57,7 @@ end desc 'Old Controller Tests on New Base' Rake::TestTask.new(:test_new_base_on_old_tests) do |t| - ENV['new_base'] = "true" - t.libs << "test" + t.libs << "test/new_base" << "test" # content_type mime_responds layout t.test_files = %w( addresses_render base benchmark caching capture dispatcher record_identifier diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 7982f06545..f6f62bcf83 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,6 +1,3 @@ -if ENV["new_base"] - require "abstract_unit2" -else $:.unshift(File.dirname(__FILE__) + '/../lib') $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') @@ -41,4 +38,3 @@ ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') ActionController::Base.view_paths = FIXTURE_LOAD_PATH -end
\ No newline at end of file diff --git a/actionpack/test/abstract_unit2.rb b/actionpack/test/new_base/abstract_unit.rb index 519e6bea36..e72165ee67 100644 --- a/actionpack/test/abstract_unit2.rb +++ b/actionpack/test/new_base/abstract_unit.rb @@ -1,7 +1,9 @@ +$:.unshift(File.dirname(__FILE__) + '/../../lib') +$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/../lib') -$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') -$:.unshift(File.dirname(__FILE__) + '/lib') +ENV['new_base'] = "true" +$stderr.puts "Running old tests on new_base" require 'test/unit' require 'active_support' @@ -16,7 +18,7 @@ require 'active_support/dependencies' ActiveSupport::Dependencies.hook! -FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') +FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), '../fixtures') module ActionController Base.session = { |