Merge branch 'master' of github.com:rails/rails

1 files changed, 22 insertions, 4 deletions

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 957deb8a60..254ea9ecf6 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -3,27 +3,45 @@ require 'rails/test_unit/sub_test_task'
 
 task default: :test
 
-desc 'Runs test:units, test:functionals, test:generators, test:integration, test:jobs together'
+desc "Runs all tests in test folder"
 task :test do
   Rails::TestTask.test_creator(Rake.application.top_level_tasks).invoke_rake_task
 end
 
 namespace :test do
   task :prepare do
-    # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
+    # Placeholder task for other Railtie and plugins to enhance.
+    # If used with Active Record, this task runs before the database schema is synchronized.
   end
 
-  task :run => ['test:units', 'test:functionals', 'test:generators', 'test:integration', 'test:jobs']
+  Rails::TestTask.new(:run) do |t|
+    t.pattern = "test/**/*_test.rb"
+  end
+
+  desc "Run tests quickly, but also reset db"
+  task :db => %w[db:test:prepare test]
 
-  # Inspired by: http://ngauthier.com/2012/02/quick-tests-with-bash.html
   desc "Run tests quickly by merging all types and not resetting db"
   Rails::TestTask.new(:all) do |t|
     t.pattern = "test/**/*_test.rb"
   end
 
+  Rake::Task["test:all"].enhance do
+    Rake::Task["test:deprecate_all"].invoke
+  end
+
+  task :deprecate_all do
+    ActiveSupport::Deprecation.warn "rake test:all is deprecated and will be removed in Rails 5. " \
+    "Use rake test to run all tests in test directory."
+  end
+
   namespace :all do
     desc "Run tests quickly, but also reset db"
     task :db => %w[db:test:prepare test:all]
+
+    Rake::Task["test:all:db"].enhance do
+      Rake::Task["test:deprecate_all"].invoke
+    end
   end
 
   Rails::TestTask.new(single: "test:prepare")