Merge pull request #26637 from y-yagi/prevent_plugin_test_run_twice

use `active_support/testing/autorun` in `bin/test` script

2 files changed, 9 insertions, 1 deletions

diff --git a/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt b/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt
index 62b94618fd..c0fbb84a93 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt
+++ b/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt
@@ -5,4 +5,6 @@ require 'rails/test_unit/minitest_plugin'
 
 Rails::TestUnitReporter.executable = 'bin/test'
 
-exit Minitest.run(ARGV)
+Minitest.run_via[:rails] = true
+
+require "active_support/testing/autorun"
diff --git a/railties/test/generators/plugin_test_runner_test.rb b/railties/test/generators/plugin_test_runner_test.rb
index 04b4b10254..7a10a2afa9 100644
--- a/railties/test/generators/plugin_test_runner_test.rb
+++ b/railties/test/generators/plugin_test_runner_test.rb
@@ -86,6 +86,12 @@ class PluginTestRunnerTest < ActiveSupport::TestCase
     assert_match(%r{cannot load such file.+test/not_exists\.rb}, error)
   end
 
+  def test_executed_only_once
+    create_test_file "foo"
+    result =  run_test_command("test/foo_test.rb")
+    assert_equal 1, result.scan(/1 runs, 1 assertions, 0 failures/).length
+  end
+
   private
     def plugin_path
       "#{@destination_root}/bukkits"