From 1269795ae2a6126f8a7b3e1e454c2211dba079d2 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Tue, 27 Sep 2016 12:12:12 +0900 Subject: use `active_support/testing/autorun` in `bin/test` script 29f0fbd5db643b885665e4a14c7de3bf6c0d9c96 has changed that always call `Minitest.autorun` in `active_support/testing/autorun`. Therefore, when used directly `Minitest.run`, tests are performed twice. --- railties/lib/rails/generators/rails/plugin/templates/bin/test.tt | 4 +++- railties/test/generators/plugin_test_runner_test.rb | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'railties') 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" -- cgit v1.2.3