From fe98d21289b7510182e338f352f5a416bd01f1ad Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Fri, 16 Sep 2016 09:26:10 -0700 Subject: improve test coverage --- railties/lib/rails/commands/test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/commands/test.rb') diff --git a/railties/lib/rails/commands/test.rb b/railties/lib/rails/commands/test.rb index 219c2fa4e0..cc0cc3d65a 100644 --- a/railties/lib/rails/commands/test.rb +++ b/railties/lib/rails/commands/test.rb @@ -1,9 +1,9 @@ require "rails/test_unit/minitest_plugin" if defined?(ENGINE_ROOT) - $: << File.expand_path("test", ENGINE_ROOT) + $LOAD_PATH << File.expand_path("test", ENGINE_ROOT) else - $: << File.expand_path("../../test", APP_PATH) + $LOAD_PATH << File.expand_path("../../test", APP_PATH) end exit Minitest.run(ARGV) -- cgit v1.2.3 From 45dce0c0030129b86413fbcbaa4f71f721847509 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Fri, 16 Sep 2016 09:31:39 -0700 Subject: support minitest after_run for parity to regular minitest see https://github.com/seattlerb/minitest/blob/f9605387e4af7d657921a83aaf0ae364f6d26a57/lib/minitest.rb#L51-L65 --- railties/lib/rails/commands/test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/commands/test.rb') diff --git a/railties/lib/rails/commands/test.rb b/railties/lib/rails/commands/test.rb index cc0cc3d65a..f4699b0347 100644 --- a/railties/lib/rails/commands/test.rb +++ b/railties/lib/rails/commands/test.rb @@ -6,4 +6,6 @@ else $LOAD_PATH << File.expand_path("../../test", APP_PATH) end -exit Minitest.run(ARGV) +result = Minitest.run(ARGV) +Minitest.class_variable_get(:@@after_run).reverse_each(&:call) +exit result -- cgit v1.2.3 From 3f2e861da767565e334fc824b9dc252f1978833b Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Fri, 23 Sep 2016 17:26:43 -0700 Subject: switch to autorun to support after_run and patch less --- railties/lib/rails/commands/test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'railties/lib/rails/commands/test.rb') diff --git a/railties/lib/rails/commands/test.rb b/railties/lib/rails/commands/test.rb index f4699b0347..03884a073a 100644 --- a/railties/lib/rails/commands/test.rb +++ b/railties/lib/rails/commands/test.rb @@ -6,6 +6,4 @@ else $LOAD_PATH << File.expand_path("../../test", APP_PATH) end -result = Minitest.run(ARGV) -Minitest.class_variable_get(:@@after_run).reverse_each(&:call) -exit result +require "minitest/autorun" -- cgit v1.2.3