Merge pull request #392 from janx/master

Patch for performance test: make it run with ruby19/minitest

1 files changed, 25 insertions, 0 deletions

diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 1fbbb40132..f96319f472 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -65,6 +65,31 @@ module ApplicationTests
       run_test '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 'performance/posts_test.rb'
+    end
+
     private
       def run_test(name)
         result = ruby '-Itest', "#{app_path}/test/#{name}"