2 files changed, 129 insertions, 1 deletions
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 715debf344..67c744b529 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -65,8 +65,11 @@ class PluginGeneratorTest < Rails::Generators::TestCase
       assert_match(/require.+test\/dummy\/config\/environment/, content)
       assert_match(/ActiveRecord::Migrator\.migrations_paths.+test\/dummy\/db\/migrate/, content)
       assert_match(/Minitest\.backtrace_filter = Minitest::BacktraceFilter\.new/, content)
+      assert_match(/Rails::TestUnitReporter\.executable = 'bin\/test'/, content)
     end
     assert_file "test/bukkits_test.rb", /assert_kind_of Module, Bukkits/
+    assert_file 'bin/test'
+    assert_no_file 'bin/rails'
   end
 
   def test_generating_test_files_in_full_mode
@@ -223,7 +226,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     run_generator
     FileUtils.cd destination_root
     quietly { system 'bundle install' }
-    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
+    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bin/test 2>&1`)
   end
 
   def test_ensure_that_tests_works_in_full_mode
@@ -315,7 +318,9 @@ class PluginGeneratorTest < Rails::Generators::TestCase
       assert_match(/ActiveRecord::Migrator\.migrations_paths.+\.\.\/test\/dummy\/db\/migrate/, content)
       assert_match(/ActiveRecord::Migrator\.migrations_paths.+<<.+\.\.\/db\/migrate/, content)
       assert_match(/ActionDispatch::IntegrationTest\.fixture_path = ActiveSupport::TestCase\.fixture_pat/, content)
+      assert_no_match(/Rails::TestUnitReporter\.executable = 'bin\/test'/, content)
     end
+    assert_no_file 'bin/test'
   end
 
   def test_create_mountable_application_with_mountable_option_and_hypenated_name
diff --git a/railties/test/generators/plugin_test_runner_test.rb b/railties/test/generators/plugin_test_runner_test.rb
new file mode 100644
index 0000000000..0887afd0db
--- /dev/null
+++ b/railties/test/generators/plugin_test_runner_test.rb
@@ -0,0 +1,123 @@
+require 'tmpdir'
+require 'abstract_unit'
+
+class PluginTestRunnerTest < ActiveSupport::TestCase
+  def setup
+    @destination_root = Dir.mktmpdir('bukkits')
+    Dir.chdir(@destination_root) { `bundle exec rails plugin new bukkits --skip-bundle` }
+    plugin_file 'test/dummy/db/schema.rb', ''
+  end
+
+  def teardown
+    FileUtils.rm_rf(@destination_root)
+  end
+
+  def test_run_single_file
+    create_test_file 'foo'
+    create_test_file 'bar'
+    assert_match "1 runs, 1 assertions, 0 failures", run_test_command("test/foo_test.rb")
+  end
+
+  def test_run_multiple_files
+    create_test_file 'foo'
+    create_test_file 'bar'
+    assert_match "2 runs, 2 assertions, 0 failures", run_test_command("test/foo_test.rb test/bar_test.rb")
+  end
+
+  def test_mix_files_and_line_filters
+    create_test_file 'account'
+    plugin_file 'test/post_test.rb', <<-RUBY
+      require 'test_helper'
+
+      class PostTest < ActiveSupport::TestCase
+        def test_post
+          puts 'PostTest'
+          assert true
+        end
+
+        def test_line_filter_does_not_run_this
+          assert true
+        end
+      end
+    RUBY
+
+    run_test_command('test/account_test.rb test/post_test.rb:4').tap do |output|
+      assert_match 'AccountTest', output
+      assert_match 'PostTest', output
+      assert_match '2 runs, 2 assertions', output
+    end
+  end
+
+  def test_multiple_line_filters
+    create_test_file 'account'
+    create_test_file 'post'
+
+    run_test_command('test/account_test.rb:4 test/post_test.rb:4').tap do |output|
+      assert_match 'AccountTest', output
+      assert_match 'PostTest', output
+    end
+  end
+
+  def test_line_filter_without_line_runs_all_tests
+    create_test_file 'account'
+
+    run_test_command('test/account_test.rb:').tap do |output|
+      assert_match 'AccountTest', output
+    end
+  end
+
+  def test_output_inline_by_default
+    create_test_file 'post', pass: false
+
+    output = run_test_command('test/post_test.rb')
+    assert_match %r{Running:\n\nPostTest\nF\n\nwups!\n\nbin/test #{plugin_path}/test/post_test.rb:6}, output
+  end
+
+  def test_only_inline_failure_output
+    create_test_file 'post', pass: false
+
+    output = run_test_command('test/post_test.rb')
+    assert_match %r{Finished in.*\n\n1 runs, 1 assertions}, output
+  end
+
+  def test_fail_fast
+    create_test_file 'post', pass: false
+
+    assert_match(/Interrupt/,
+      capture(:stderr) { run_test_command('test/post_test.rb --fail-fast') })
+  end
+
+  def test_raise_error_when_specified_file_does_not_exist
+    error = capture(:stderr) { run_test_command('test/not_exists.rb') }
+    assert_match(%r{cannot load such file.+test/not_exists\.rb}, error)
+  end
+
+  private
+    def plugin_path
+      "#{@destination_root}/bukkits"
+    end
+
+    def run_test_command(arguments)
+      Dir.chdir(plugin_path) { `bin/test #{arguments}` }
+    end
+
+    def create_test_file(name, pass: true)
+      plugin_file "test/#{name}_test.rb", <<-RUBY
+        require 'test_helper'
+
+        class #{name.camelize}Test < ActiveSupport::TestCase
+          def test_truth
+            puts "#{name.camelize}Test"
+            assert #{pass}, 'wups!'
+          end
+        end
+      RUBY
+    end
+
+    def plugin_file(path, contents, mode: 'w')
+      FileUtils.mkdir_p File.dirname("#{plugin_path}/#{path}")
+      File.open("#{plugin_path}/#{path}", mode) do |f|
+        f.puts contents
+      end
+    end
+end