actionpack/lib/action_controller/performance_test.rb activesupport/lib/active_support/testing/performance.rb railties/helpers/performance_test.rb @@ -1,9 +1,10 @@ -require 'stringio' -require 'uri' - +require 'active_support/test_case' require 'action_controller/dispatcher' require 'action_controller/test_process' +require 'stringio' +require 'uri' + module ActionController module Integration #:nodoc: # An integration Session instance represents a set of requests and responses @@ -580,7 +581,7 @@ EOF # end # end # end - class IntegrationTest < Test::Unit::TestCase + class IntegrationTest < ActiveSupport::TestCase include Integration::Runner # Work around a bug in test/unit caused by the default test being named actionpack/lib/action_controller/integration.rb @@ -51,6 +51,7 @@ class AppGenerator < Rails::Generator::Base m.template "helpers/application.rb", "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest } m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb" m.template "helpers/test_helper.rb", "test/test_helper.rb" + m.template "helpers/performance_test.rb", "test/performance/browsing_test.rb" # database.yml and routes.rb m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => { @@ -155,6 +156,7 @@ class AppGenerator < Rails::Generator::Base test/fixtures test/functional test/integration + test/performance test/unit vendor vendor/plugins railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -103,6 +103,21 @@ namespace :test do end Rake::Task['test:integration'].comment = "Run the integration tests in test/integration" + Rake::TestTask.new(:benchmark) do |t| + t.libs << 'test' + t.pattern = 'test/performance/**/*_test.rb' + t.verbose = true + t.options = '-- --benchmark' + end + Rake::Task['test:benchmark'].comment = 'Benchmark the performance tests' + + Rake::TestTask.new(:profile) do |t| + t.libs << 'test' + t.pattern = 'test/performance/**/*_test.rb' + t.verbose = true + end + Rake::Task['test:profile'].comment = 'Profile the performance tests' + Rake::TestTask.new(:plugins => :environment) do |t| t.libs << "test" railties/lib/tasks/testing.rake ba0f38f89e8473490270957849d7d5b06f6ee65b Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/eab71208db1afead6803501c8d51d77625e5ad6e eab71208db1afead6803501c8d51d77625e5ad6e 2008-06-14T02:04:38-07:00 2008-06-13T00:21:03-07:00 Performance: integration test benchmarking and profiling. [Jeremy Kemper] 194e4911a90e5edf7af4c3c2990d6c0ad3645791 Jeremy Kemper jeremy@bitsweat.net