1 files changed, 102 insertions, 10 deletions

diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 4965ab7da0..a7eb0feb11 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -234,6 +234,11 @@ module ApplicationTests
       assert_match "0 failures, 0 errors, 0 skips", run_test_command('')
     end
 
+    def test_generated_controller_works_with_rails_test
+      create_controller
+      assert_match "0 failures, 0 errors, 0 skips", run_test_command('')
+    end
+
     def test_run_multiple_folders
       create_test_file :models, 'account'
       create_test_file :controllers, 'accounts_controller'
@@ -289,21 +294,91 @@ module ApplicationTests
       end
     end
 
-    def test_multiple_line_filters
-      create_test_file :models, 'account'
-      create_test_file :models, 'post'
+    def test_more_than_one_line_filter
+      app_file 'test/models/post_test.rb', <<-RUBY
+        require 'test_helper'
 
-      run_test_command('test/models/account_test.rb:4 test/models/post_test.rb:4').tap do |output|
-        assert_match 'AccountTest', output
-        assert_match 'PostTest', output
+        class PostTest < ActiveSupport::TestCase
+          test "first filter" do
+            puts 'PostTest:FirstFilter'
+            assert true
+          end
+
+          test "second filter" do
+            puts 'PostTest:SecondFilter'
+            assert true
+          end
+
+          test "test line filter does not run this" do
+            assert true
+          end
+        end
+      RUBY
+
+      run_test_command('test/models/post_test.rb:4:9').tap do |output|
+        assert_match 'PostTest:FirstFilter', output
+        assert_match 'PostTest:SecondFilter', output
+        assert_match '2 runs, 2 assertions', output
+      end
+    end
+
+    def test_more_than_one_line_filter_with_multiple_files
+      app_file 'test/models/account_test.rb', <<-RUBY
+        require 'test_helper'
+
+        class AccountTest < ActiveSupport::TestCase
+          test "first filter" do
+            puts 'AccountTest:FirstFilter'
+            assert true
+          end
+
+          test "second filter" do
+            puts 'AccountTest:SecondFilter'
+            assert true
+          end
+
+          test "line filter does not run this" do
+            assert true
+          end
+        end
+      RUBY
+
+      app_file 'test/models/post_test.rb', <<-RUBY
+        require 'test_helper'
+
+        class PostTest < ActiveSupport::TestCase
+          test "first filter" do
+            puts 'PostTest:FirstFilter'
+            assert true
+          end
+
+          test "second filter" do
+            puts 'PostTest:SecondFilter'
+            assert true
+          end
+
+          test "line filter does not run this" do
+            assert true
+          end
+        end
+      RUBY
+
+      run_test_command('test/models/account_test.rb:4:9  test/models/post_test:4:9').tap do |output|
+        assert_match 'AccountTest:FirstFilter', output
+        assert_match 'AccountTest:SecondFilter', output
+        assert_match 'PostTest:FirstFilter', output
+        assert_match 'PostTest:SecondFilter', output
+        assert_match '4 runs, 4 assertions', output
       end
     end
 
-    def test_line_filter_without_line_runs_all_tests
+    def test_multiple_line_filters
       create_test_file :models, 'account'
+      create_test_file :models, 'post'
 
-      run_test_command('test/models/account_test.rb:').tap do |output|
+      run_test_command('test/models/account_test.rb:4 test/models/post_test.rb:4').tap do |output|
         assert_match 'AccountTest', output
+        assert_match 'PostTest', output
       end
     end
 
@@ -344,7 +419,8 @@ module ApplicationTests
       create_test_file :models, 'post', pass: false
 
       output = run_test_command('test/models/post_test.rb')
-      assert_match %r{Running:\n\nPostTest\nF\n\nwups!\n\nbin/rails test test/models/post_test.rb:6}, output
+      expect = %r{Running:\n\nPostTest\nF\n\nFailure:\nPostTest#test_truth:\nwups!\n\nbin/rails test test/models/post_test.rb:6\n\n\n\n}
+      assert_match expect, output
     end
 
     def test_only_inline_failure_output
@@ -366,6 +442,18 @@ module ApplicationTests
       assert_match(%r{cannot load such file.+test/not_exists\.rb}, error)
     end
 
+    def test_pass_TEST_env_on_rake_test
+      create_test_file :models, 'account'
+      create_test_file :models, 'post', pass: false
+      # This specifically verifies TEST for backwards compatibility with rake test
+      # as bin/rails test already supports running tests from a single file more cleanly.
+      output =  Dir.chdir(app_path) { `bin/rake test TEST=test/models/post_test.rb` }
+
+      assert_match "PostTest", output, "passing TEST= should run selected test"
+      assert_no_match "AccountTest", output, "passing TEST= should only run selected test"
+      assert_match '1 runs, 1 assertions', output
+    end
+
     private
       def run_test_command(arguments = 'test/unit/test_test.rb')
         Dir.chdir(app_path) { `bin/rails t #{arguments}` }
@@ -448,8 +536,12 @@ module ApplicationTests
         run_migration
       end
 
+      def create_controller
+        script 'generate controller admin/dashboard index'
+      end
+
       def run_migration
-        Dir.chdir(app_path) { `bin/rake db:migrate` }
+        Dir.chdir(app_path) { `bin/rails db:migrate` }
       end
   end
 end