Merge pull request #8876 from senny/extract_performance_tests

Extract ActionDispatch::PerformanceTest

16 files changed, 2 insertions, 187 deletions

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/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
deleted file mode 100644
index b745b45e17..0000000000
--- a/railties/lib/rails/commands/benchmarker.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'optparse'
-require 'rails/test_help'
-require 'rails/performance_test_help'
-
-ARGV.push('--benchmark') # HAX
-require 'active_support/testing/performance'
-ARGV.pop
-
-def options
-  options = {}
-  defaults = ActiveSupport::Testing::Performance::DEFAULTS
-
-  OptionParser.new do |opt|
-    opt.banner = "Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
-    opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
-    opt.on('-o', '--output PATH', String, 'Directory to use when writing the results.', "Default: #{defaults[:output]}") { |o| options[:output] = o }
-    opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
-    opt.parse!(ARGV)
-  end
-
-  options
-end
-
-class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc:
-  self.profile_options = options
-
-  ARGV.each do |expression|
-    eval <<-RUBY
-      def test_#{expression.parameterize('_')}
-        #{expression}
-      end
-    RUBY
-  end
-end
diff --git a/railties/lib/rails/commands/profiler.rb b/railties/lib/rails/commands/profiler.rb
deleted file mode 100644
index 315bcccf61..0000000000
--- a/railties/lib/rails/commands/profiler.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'optparse'
-require 'rails/test_help'
-require 'rails/performance_test_help'
-require 'active_support/testing/performance'
-
-def options
-  options = {}
-  defaults = ActiveSupport::Testing::Performance::DEFAULTS
-
-  OptionParser.new do |opt|
-    opt.banner = "Usage: rails profiler 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
-    opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
-    opt.on('-o', '--output PATH', String, 'Directory to use when writing the results.', "Default: #{defaults[:output]}") { |o| options[:output] = o }
-    opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
-    opt.on('-f', '--formats x,y,z', Array, 'Formats to output to.', "Default: #{defaults[:formats].join(",")}") { |m| options[:formats] = m.map(&:to_sym) }
-    opt.parse!(ARGV)
-  end
-
-  options
-end
-
-class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc:
-  self.profile_options = options
-
-  ARGV.each do |expression|
-    eval <<-RUBY
-      def test_#{expression.parameterize('_')}
-        #{expression}
-      end
-    RUBY
-  end
-end
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/generators/rails/app/templates/test/performance/browsing_test.rb b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
deleted file mode 100644
index d09ce5ad34..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { runs: 5, metrics: [:wall_time, :memory],
-  #                          output: 'tmp/performance', formats: [:flat] }
-
-  test "homepage" do
-    get '/'
-  end
-end
diff --git a/railties/lib/rails/generators/rails/performance_test/USAGE b/railties/lib/rails/generators/rails/performance_test/USAGE
deleted file mode 100644
index 9dc799559c..0000000000
--- a/railties/lib/rails/generators/rails/performance_test/USAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-Description:
-    Stubs out a new performance test. Pass the name of the test, either
-    CamelCased or under_scored, as an argument.
-
-    This generator invokes the current performance tool, which defaults to
-    TestUnit.
-
-Example:
-    `rails generate performance_test GeneralStories` creates a GeneralStories
-    performance test in test/performance/general_stories_test.rb
diff --git a/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb
deleted file mode 100644
index 56cd562f3d..0000000000
--- a/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Rails
-  module Generators
-    class PerformanceTestGenerator < NamedBase # :nodoc:
-      hook_for :performance_tool, as: :performance
-    end
-  end
-end
diff --git a/railties/lib/rails/generators/test_unit/performance/performance_generator.rb b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
deleted file mode 100644
index 5552edeee4..0000000000
--- a/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rails/generators/test_unit'
-
-module TestUnit # :nodoc:
-  module Generators # :nodoc:
-    class PerformanceGenerator < Base # :nodoc:
-      check_class_collision suffix: "Test"
-
-      def create_test_files
-        template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
deleted file mode 100644
index 2bcb482d68..0000000000
--- a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class <%= class_name %>Test < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { runs: 5, metrics: [:wall_time, :memory],
-  #                          output: 'tmp/performance', formats: [:flat] }
-
-  test "homepage" do
-    get '/'
-  end
-end
diff --git a/railties/lib/rails/performance_test_help.rb b/railties/lib/rails/performance_test_help.rb
deleted file mode 100644
index b1285efde2..0000000000
--- a/railties/lib/rails/performance_test_help.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-ActionController::Base.perform_caching = true
-ActiveSupport::Dependencies.mechanism = :require
-Rails.logger.level = ActiveSupport::Logger::INFO
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 9ad3a4e6d6..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
@@ -146,15 +146,4 @@ namespace :test do
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
   end
-
-  Rails::SubTestTask.new(benchmark: 'test:prepare') do |t|
-    t.libs << 'test'
-    t.pattern = 'test/performance/**/*_test.rb'
-    t.options = '-- --benchmark'
-  end
-
-  Rails::SubTestTask.new(profile: 'test:prepare') do |t|
-    t.libs << 'test'
-    t.pattern = 'test/performance/**/*_test.rb'
-  end
 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
diff --git a/railties/test/generators/performance_test_generator_test.rb b/railties/test/generators/performance_test_generator_test.rb
deleted file mode 100644
index 37f9857193..0000000000
--- a/railties/test/generators/performance_test_generator_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'generators/generators_test_helper'
-require 'rails/generators/rails/performance_test/performance_test_generator'
-
-class PerformanceTestGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  arguments %w(performance)
-
-  def test_performance_test_skeleton_is_created
-    run_generator
-    assert_file "test/performance/performance_test.rb", /class PerformanceTest < ActionDispatch::PerformanceTest/
-  end
-end