diff options
author | Yves Senn <yves.senn@gmail.com> | 2013-01-06 00:42:57 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2013-01-10 17:09:06 +0100 |
commit | ce8e3d307280cb07604b45523c1733a71e97770d (patch) | |
tree | e30f2ee0dc5157bb5e2c649f06e3c9e21aa34edd /railties/test | |
parent | 3e1ed7818ba1abbc331c568327c6c0d64702985e (diff) | |
download | rails-ce8e3d307280cb07604b45523c1733a71e97770d.tar.gz rails-ce8e3d307280cb07604b45523c1733a71e97770d.tar.bz2 rails-ce8e3d307280cb07604b45523c1733a71e97770d.zip |
remove performance tests from the default stack
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/test_test.rb | 25 | ||||
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 0 insertions, 28 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 |