Merge pull request #8876 from senny/extract_performance_tests

Extract ActionDispatch::PerformanceTest

3 files changed, 0 insertions, 40 deletions

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