diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-15 16:21:32 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-15 16:21:32 -0700 |
| commit | 09c70a0c03aa755a66dc94ebb2b98b283c7137c9 (patch) | |
| tree | 33008fcd1b46299bd0155afd19cffc05c3dba032 /railties/lib | |
| parent | 59b2daba4f2d1eadabd3e89299114f0d77ae454d (diff) | |
| download | rails-09c70a0c03aa755a66dc94ebb2b98b283c7137c9.tar.gz rails-09c70a0c03aa755a66dc94ebb2b98b283c7137c9.tar.bz2 rails-09c70a0c03aa755a66dc94ebb2b98b283c7137c9.zip | |
Use test/performance/test_helper to do test setup then boost log level and turn on caching
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/lib/tasks/testing.rake | 4 |
2 files changed, 3 insertions, 2 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 d31ab5bb49..80e8eabfd3 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_helper.rb", "test/performance/test_helper.rb" m.template "helpers/performance_test.rb", "test/performance/browsing_test.rb" # database.yml and routes.rb diff --git a/railties/lib/tasks/testing.rake b/railties/lib/tasks/testing.rake index 2cadcd55fa..c8ba6eed94 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/tasks/testing.rake @@ -103,7 +103,7 @@ namespace :test do end Rake::Task['test:integration'].comment = "Run the integration tests in test/integration" - Rake::TestTask.new(:benchmark) do |t| + Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t| t.libs << 'test' t.pattern = 'test/performance/**/*_test.rb' t.verbose = true @@ -111,7 +111,7 @@ namespace :test do end Rake::Task['test:benchmark'].comment = 'Benchmark the performance tests' - Rake::TestTask.new(:profile) do |t| + Rake::TestTask.new(:profile => 'db:test:prepare') do |t| t.libs << 'test' t.pattern = 'test/performance/**/*_test.rb' t.verbose = true |