diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 16:30:27 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 16:30:27 -0500 |
commit | 6d214c953b74c40d6247dfd2d4526991a0f99f5c (patch) | |
tree | 83349dfa5e523a3afa4a6a1f61e6f3a848412f75 /actionpack/Rakefile | |
parent | 199a423f42c58f3904d75d7a2ab08496bba907c4 (diff) | |
download | rails-6d214c953b74c40d6247dfd2d4526991a0f99f5c.tar.gz rails-6d214c953b74c40d6247dfd2d4526991a0f99f5c.tar.bz2 rails-6d214c953b74c40d6247dfd2d4526991a0f99f5c.zip |
Merge abstract_controller/test_helper and new_base/test_helper since they are expected to run in the same testing sandbox
Diffstat (limited to 'actionpack/Rakefile')
-rw-r--r-- | actionpack/Rakefile | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index b923414cef..0d8362ad0b 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -34,11 +34,8 @@ end desc "Run all unit tests" task :test => [:test_action_pack, :test_active_record_integration, :test_new_base] -test_lib_dirs = ENV["NEW"] ? ["test/new_base"] : [] -test_lib_dirs.push "test", "test/lib" -# test_lib_dirs = [ENV["NEW"] ? "test/new_base" : "test", "test/lib"] Rake::TestTask.new(:test_action_pack) do |t| - t.libs.concat test_lib_dirs + t.libs << 'test' # make sure we include the tests in alphabetical order as on some systems # this will not happen automatically and the tests (as a whole) will error @@ -51,44 +48,24 @@ end task :isolated_test do ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) Dir.glob("test/{controller,dispatch,template}/**/*_test.rb").all? do |file| - system(ruby, "-Ilib:#{test_lib_dirs * ':'}", file) + system(ruby, "-Itest", file) end or raise "Failures" end desc 'ActiveRecord Integration Tests' Rake::TestTask.new(:test_active_record_integration) do |t| - t.libs.concat test_lib_dirs + t.libs << 'test' t.test_files = Dir.glob("test/activerecord/*_test.rb") t.verbose = true end desc 'New Controller Tests' Rake::TestTask.new(:test_new_base) do |t| - t.libs << "test/new_base" << "test/lib" + t.libs << 'test' t.test_files = Dir.glob("test/{abstract_controller,new_base}/*_test.rb") t.verbose = true end -desc 'Old Controller Tests on New Base' -Rake::TestTask.new(:test_new_base_on_old_tests) do |t| - t.libs << "test/new_base" << "test/lib" - - t.verbose = true - # ==== Not ported - # * filters - - t.test_files = Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort + %w( - action_pack_assertions addresses_render assert_select - base benchmark caching capture content_type cookie dispatcher - filter_params flash helper http_basic_authentication - http_digest_authentication integration layout logging mime_responds - record_identifier redirect render render_js render_json - render_other render_xml request_forgery_protection rescue - resources routing selector send_file test url_rewriter - verification view_paths webservice - ).map { |name| "test/controller/#{name}_test.rb" } -end - # Genereate the RDoc documentation Rake::RDocTask.new { |rdoc| |