diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-03 22:59:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 22:59:43 -0400 |
| commit | 8648f289f01656b2258687126108c389127108e0 (patch) | |
| tree | 1ccb15f72f00d8c30497ad4e48f203545dd3383b /railties/lib/rails/test_unit/testing.rake | |
| parent | 28b3582aa2cd6007c708134b911b3f360ad5d659 (diff) | |
| parent | e8c33349bfabca28996ac74d344d69c7aaffec50 (diff) | |
| download | rails-8648f289f01656b2258687126108c389127108e0.tar.gz rails-8648f289f01656b2258687126108c389127108e0.tar.bz2 rails-8648f289f01656b2258687126108c389127108e0.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'railties/lib/rails/test_unit/testing.rake')
| -rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 4c157c1262..ef19bd7626 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -4,15 +4,15 @@ require "rails/test_unit/minitest_plugin" task default: :test -desc "Runs all tests in test folder" +desc "Runs all tests in test folder except system ones" task :test do $: << "test" - pattern = if ENV.key?("TEST") - ENV["TEST"] + + if ENV.key?("TEST") + Minitest.rake_run([ENV["TEST"]]) else - "test" + Minitest.rake_run(["test"], ["test/system/**/*"]) end - Minitest.rake_run([pattern]) end namespace :test do @@ -47,4 +47,9 @@ namespace :test do $: << "test" Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"]) end + + task system: "test:prepare" do + $: << "test" + Minitest.rake_run(["test/system"]) + end end |