remove performance tests from the default stack

10 files changed, 5 insertions, 47 deletions

diff --git a/guides/code/getting_started/README.rdoc b/guides/code/getting_started/README.rdoc
index 8d1b0f42e5..232856ca5f 100644
--- a/guides/code/getting_started/README.rdoc
+++ b/guides/code/getting_started/README.rdoc
@@ -25,4 +25,4 @@ Things you may want to cover:
 
 If you plan to generate application documentation with `rake doc:app` this file
 is expected to be `README.rdoc`, otherwise please feel free to rename it and use
-a different markup language.
+a different markup language.
\ No newline at end of file
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index ced04bbbc0..cd0b99b177 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -177,7 +177,6 @@ The full set of methods that can be used in this block are as follows:
 * `javascripts` turns on the hook for JavaScript files in generators. Used in Rails for when the `scaffold` generator is run. Defaults to `true`.
 * `javascript_engine` configures the engine to be used (for eg. coffee) when generating assets. Defaults to `nil`.
 * `orm` defines which orm to use. Defaults to `false` and will use Active Record by default.
-* `performance_tool` defines which performance tool to use. Defaults to `nil`.
 * `resource_controller` defines which generator to use for generating a controller when using `rails generate resource`. Defaults to `:controller`.
 * `scaffold_controller` different from `resource_controller`, defines which generator to use for generating a _scaffolded_ controller when using `rails generate scaffold`. Defaults to `:scaffold_controller`.
 * `stylesheets` turns on the hook for stylesheets in generators. Used in Rails for when the `scaffold` generator is run, but this hook can be used in other generates as well. Defaults to `true`.
diff --git a/guides/source/testing.md b/guides/source/testing.md
index 7747318d32..09d6d2d5ee 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -39,10 +39,10 @@ Rails creates a `test` folder for you as soon as you create a Rails project usin
 ```bash
 $ ls -F test
 
-fixtures/  functional/  integration/  performance/  test_helper.rb  unit/
+fixtures/  functional/  integration/  test_helper.rb  unit/
 ```
 
-The `unit` directory is meant to hold tests for your models, the `functional` directory is meant to hold tests for your controllers, the `integration` directory is meant to hold tests that involve any number of controllers interacting, and the `performance` directory is meant for performance tests.
+The `unit` directory is meant to hold tests for your models, the `functional` directory is meant to hold tests for your controllers and the `integration` directory is meant to hold tests that involve any number of controllers interacting.
 
 Fixtures are a way of organizing test data; they reside in the `fixtures` folder.
 
@@ -760,14 +760,12 @@ You don't need to set up and run your tests by hand on a test-by-test basis. Rai
 | Tasks                           | Description |
 | ------------------------------- | ----------- |
 | `rake test`                     | Runs all unit, functional and integration tests. You can also simply run `rake` as the _test_ target is the default.|
-| `rake test:benchmark`           | Benchmark the performance tests|
 | `rake test:controllers`         | Runs all the controller tests from `test/controllers`|
 | `rake test:functionals`         | Runs all the functional tests from `test/controllers`, `test/mailers`, and `test/functional`|
 | `rake test:helpers`             | Runs all the helper tests from `test/helpers`|
 | `rake test:integration`         | Runs all the integration tests from `test/integration`|
 | `rake test:mailers`             | Runs all the mailer tests from `test/mailers`|
 | `rake test:models`              | Runs all the model tests from `test/models`|
-| `rake test:profile`             | Profile the performance tests|
 | `rake test:recent`              | Tests recent changes|
 | `rake test:uncommitted`         | Runs all the tests which are uncommitted. Supports Subversion and Git|
 | `rake test:units`               | Runs all the unit tests from `test/models`, `test/helpers`, and `test/unit`|
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 9cb11f66c6..aacde52cfc 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -24,8 +24,6 @@ The most common rails commands are:
 In addition to those, there are:
  application  Generate the Rails application code
  destroy      Undo code generated with "generate" (short-cut alias: "d")
- benchmarker  See how fast a piece of code runs
- profiler     Get profile information from a piece of code
  plugin new   Generates skeleton for developing a Rails plugin
  runner       Run a piece of code in the application environment (short-cut alias: "r")
 
@@ -51,11 +49,6 @@ when 'generate', 'destroy', 'plugin'
     require "rails/commands/#{command}"
   end
 
-when 'benchmarker', 'profiler'
-  require APP_PATH
-  Rails.application.require_environment!
-  require "rails/commands/#{command}"
-
 when 'console'
   require 'rails/commands/console'
   options = Rails::Console.parse_arguments(ARGV)
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index d9a91b74d1..4b767ea0c6 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -50,7 +50,6 @@ module Rails
         javascripts: true,
         javascript_engine: :js,
         orm: false,
-        performance_tool: nil,
         resource_controller: :controller,
         resource_route: true,
         scaffold_controller: :scaffold_controller,
@@ -179,7 +178,6 @@ module Rails
           "#{test}:model",
           "#{test}:scaffold",
           "#{test}:view",
-          "#{test}:performance",
           "#{template}:controller",
           "#{template}:scaffold",
           "#{template}:mailer",
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 784c97aee0..e22be40381 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -114,7 +114,6 @@ module Rails
       empty_directory_with_keep_file 'test/helpers'
       empty_directory_with_keep_file 'test/integration'
 
-      template 'test/performance/browsing_test.rb'
       template 'test/test_helper.rb'
     end
 
@@ -141,7 +140,7 @@ module Rails
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
-    RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]
+    RESERVED_NAMES = %w[application destroy plugin runner test]
 
     class AppGenerator < AppBase # :nodoc:
       add_shared_options_for "application"
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index ed89ce4128..f52c4c44b7 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -5,7 +5,6 @@ module Rails
                                    fixture_replacement: nil
 
       c.integration_tool :test_unit
-      c.performance_tool :test_unit
     end
 
     rake_tasks do
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index a18d28f958..f0d46fd959 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -45,7 +45,7 @@ end
 
 task default: :test
 
-desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile)'
+desc 'Runs test:units, test:functionals, test:integration together'
 task :test do
   Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
 end
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index f6bcaa466a..c7ad2fba8f 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -52,31 +52,6 @@ module ApplicationTests
       run_test_file 'integration/posts_test.rb'
     end
 
-    test "performance test" do
-      controller 'posts', <<-RUBY
-        class PostsController < ActionController::Base
-        end
-      RUBY
-
-      app_file 'app/views/posts/index.html.erb', <<-HTML
-        Posts#index
-      HTML
-
-      app_file 'test/performance/posts_test.rb', <<-RUBY
-        require 'test_helper'
-        require 'rails/performance_test_help'
-
-        class PostsTest < ActionDispatch::PerformanceTest
-          def test_index
-            get '/posts'
-            assert_response :success
-          end
-        end
-      RUBY
-
-      run_test_file 'performance/posts_test.rb'
-    end
-
     private
       def run_test_file(name)
         result = ruby '-Itest', "#{app_path}/test/#{name}"
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 5d5be689e6..ee93dc49cd 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -34,7 +34,6 @@ DEFAULT_APP_FILES = %w(
   test/helpers
   test/mailers
   test/integration
-  test/performance
   vendor
   vendor/assets
   tmp/cache
@@ -218,7 +217,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
     end
-    assert_file "test/performance/browsing_test.rb"
   end
 
   def test_generator_if_skip_sprockets_is_given
@@ -241,7 +239,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
       assert_no_match(/config\.assets\.css_compressor = :sass/, content)
       assert_no_match(/config\.assets\.version = '1\.0'/, content)
     end
-    assert_file "test/performance/browsing_test.rb"
   end
 
   def test_inclusion_of_javascript_runtime