Performance: integration test benchmarking and profiling. [Jeremy Kemper]

2 files changed, 17 insertions, 0 deletions

diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 2f2dd82682..d31ab5bb49 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.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
diff --git a/railties/lib/tasks/testing.rake b/railties/lib/tasks/testing.rake
index cc2376cbb3..2cadcd55fa 100644
--- a/railties/lib/tasks/testing.rake
+++ b/railties/lib/tasks/testing.rake
@@ -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"