diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-06-08 12:05:12 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-06-08 12:05:12 +0200 |
commit | e8d02ccf8c485cd2e5f6e32713bd8fc23b7b5560 (patch) | |
tree | d6b8e1a26a3e69e38f14c2e61f698ab8e0fe5042 /railties/lib/rails/test_unit/testing.rake | |
parent | 8e7f8ef5d6209367734530b258f5fbeb0fc24c28 (diff) | |
parent | b6fc8e25a10cc4abdd03018798b180270d6c5d7f (diff) | |
download | rails-e8d02ccf8c485cd2e5f6e32713bd8fc23b7b5560.tar.gz rails-e8d02ccf8c485cd2e5f6e32713bd8fc23b7b5560.tar.bz2 rails-e8d02ccf8c485cd2e5f6e32713bd8fc23b7b5560.zip |
Merge pull request #19571 from kaspth/improve-runner-integration
Improve Test Runner's Minitest integration.
Diffstat (limited to 'railties/lib/rails/test_unit/testing.rake')
-rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 0f26621b59..dda492f974 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -1,12 +1,13 @@ -require "rails/test_unit/runner" +gem 'minitest' +require 'minitest' +require 'rails/test_unit/minitest_plugin' task default: :test desc "Runs all tests in test folder" task :test do $: << "test" - args = ARGV[0] == "test" ? ARGV[1..-1] : [] - Rails::TestRunner.run(args) + Minitest.run(['test']) end namespace :test do @@ -23,22 +24,22 @@ namespace :test do ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name| task name => "test:prepare" do $: << "test" - Rails::TestRunner.run(["test/#{name}"]) + Minitest.run(["test/#{name}"]) end end task :generators => "test:prepare" do $: << "test" - Rails::TestRunner.run(["test/lib/generators"]) + Minitest.run(["test/lib/generators"]) end task :units => "test:prepare" do $: << "test" - Rails::TestRunner.run(["test/models", "test/helpers", "test/unit"]) + Minitest.run(["test/models", "test/helpers", "test/unit"]) end task :functionals => "test:prepare" do $: << "test" - Rails::TestRunner.run(["test/controllers", "test/mailers", "test/functional"]) + Minitest.run(["test/controllers", "test/mailers", "test/functional"]) end end |