diff options
author | Yves Senn <yves.senn@gmail.com> | 2016-11-21 17:24:10 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2016-11-21 17:25:12 +0100 |
commit | 2b4a9735d816d3a05c7fca207d97bebcb09c95a0 (patch) | |
tree | 2bbedc390ef599a0a09e426f9b4c9777ea65d820 | |
parent | bb2a832b9b063c41864c0490ca0ed6fee59eb2e4 (diff) | |
download | rails-2b4a9735d816d3a05c7fca207d97bebcb09c95a0.tar.gz rails-2b4a9735d816d3a05c7fca207d97bebcb09c95a0.tar.bz2 rails-2b4a9735d816d3a05c7fca207d97bebcb09c95a0.zip |
update bin/test scripts to prevent double runs.
The test runner was updated to make use of autorun. This caused the
`bin/test` scripts to run Minitest twice.
-rwxr-xr-x | actionmailer/bin/test | 2 | ||||
-rwxr-xr-x | actionpack/bin/test | 2 | ||||
-rwxr-xr-x | actionview/bin/test | 2 | ||||
-rwxr-xr-x | activemodel/bin/test | 2 | ||||
-rwxr-xr-x | activerecord/bin/test | 2 | ||||
-rwxr-xr-x | activesupport/bin/test | 2 | ||||
-rw-r--r-- | tools/test.rb | 2 |
7 files changed, 2 insertions, 12 deletions
diff --git a/actionmailer/bin/test b/actionmailer/bin/test index 84a05bba08..a7beb14b27 100755 --- a/actionmailer/bin/test +++ b/actionmailer/bin/test @@ -2,5 +2,3 @@ COMPONENT_ROOT = File.expand_path("..", __dir__) require File.expand_path("../tools/test", COMPONENT_ROOT) - -exit Minitest.run(ARGV) diff --git a/actionpack/bin/test b/actionpack/bin/test index 84a05bba08..a7beb14b27 100755 --- a/actionpack/bin/test +++ b/actionpack/bin/test @@ -2,5 +2,3 @@ COMPONENT_ROOT = File.expand_path("..", __dir__) require File.expand_path("../tools/test", COMPONENT_ROOT) - -exit Minitest.run(ARGV) diff --git a/actionview/bin/test b/actionview/bin/test index 84a05bba08..a7beb14b27 100755 --- a/actionview/bin/test +++ b/actionview/bin/test @@ -2,5 +2,3 @@ COMPONENT_ROOT = File.expand_path("..", __dir__) require File.expand_path("../tools/test", COMPONENT_ROOT) - -exit Minitest.run(ARGV) diff --git a/activemodel/bin/test b/activemodel/bin/test index 84a05bba08..a7beb14b27 100755 --- a/activemodel/bin/test +++ b/activemodel/bin/test @@ -2,5 +2,3 @@ COMPONENT_ROOT = File.expand_path("..", __dir__) require File.expand_path("../tools/test", COMPONENT_ROOT) - -exit Minitest.run(ARGV) diff --git a/activerecord/bin/test b/activerecord/bin/test index 23add35d45..3a9547e5c1 100755 --- a/activerecord/bin/test +++ b/activerecord/bin/test @@ -17,5 +17,3 @@ module Minitest end Minitest.extensions.unshift "active_record" - -exit Minitest.run(ARGV) diff --git a/activesupport/bin/test b/activesupport/bin/test index 84a05bba08..a7beb14b27 100755 --- a/activesupport/bin/test +++ b/activesupport/bin/test @@ -2,5 +2,3 @@ COMPONENT_ROOT = File.expand_path("..", __dir__) require File.expand_path("../tools/test", COMPONENT_ROOT) - -exit Minitest.run(ARGV) diff --git a/tools/test.rb b/tools/test.rb index 7819c13ee2..824ee57c96 100644 --- a/tools/test.rb +++ b/tools/test.rb @@ -13,3 +13,5 @@ module Rails end Rails::TestUnitReporter.executable = "bin/test" +Minitest.run_via[:rails] = true +require "active_support/testing/autorun" |