diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-10 21:13:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-10 21:13:22 +0200 |
commit | 3fa66935fd65e2d834dcc743bd835afb5b875f7f (patch) | |
tree | 361e00c0c82de24f359bbe5ba32b76d9913c609e /railties/lib/rails/test_unit/testing.rake | |
parent | b6300f3ecc79bff29cf9bb804a30fd92403feac1 (diff) | |
parent | 0d72489b2a08487f71dd4230846c01a5d99ef35f (diff) | |
download | rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.tar.gz rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.tar.bz2 rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.zip |
Merge pull request #29572 from kaspth/test-runner-no-eager-require
Don't eagerly require Rails' minitest plugin.
Diffstat (limited to 'railties/lib/rails/test_unit/testing.rake')
-rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 486446b463..97dd5cef10 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -1,6 +1,6 @@ gem "minitest" require "minitest" -require_relative "minitest_plugin" +require_relative "runner" task default: :test @@ -9,9 +9,9 @@ task :test do $: << "test" if ENV.key?("TEST") - Minitest.rake_run([ENV["TEST"]]) + Rails::TestUnit::Runner.rake_run([ENV["TEST"]]) else - Minitest.rake_run(["test"], ["test/system/**/*"]) + Rails::TestUnit::Runner.rake_run end end @@ -29,28 +29,28 @@ namespace :test do ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name| task name => "test:prepare" do $: << "test" - Minitest.rake_run(["test/#{name}"]) + Rails::TestUnit::Runner.rake_run(["test/#{name}"]) end end task generators: "test:prepare" do $: << "test" - Minitest.rake_run(["test/lib/generators"]) + Rails::TestUnit::Runner.rake_run(["test/lib/generators"]) end task units: "test:prepare" do $: << "test" - Minitest.rake_run(["test/models", "test/helpers", "test/unit"]) + Rails::TestUnit::Runner.rake_run(["test/models", "test/helpers", "test/unit"]) end task functionals: "test:prepare" do $: << "test" - Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"]) + Rails::TestUnit::Runner.rake_run(["test/controllers", "test/mailers", "test/functional"]) end desc "Run system tests only" task system: "test:prepare" do $: << "test" - Minitest.rake_run(["test/system"]) + Rails::TestUnit::Runner.rake_run(["test/system"]) end end |