Add `test:jobs` task

2 files changed, 17 insertions, 6 deletions

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 285e2ce846..957deb8a60 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -3,7 +3,7 @@ require 'rails/test_unit/sub_test_task'
 
 task default: :test
 
-desc 'Runs test:units, test:functionals, test:generators, test:integration together'
+desc 'Runs test:units, test:functionals, test:generators, test:integration, test:jobs together'
 task :test do
   Rails::TestTask.test_creator(Rake.application.top_level_tasks).invoke_rake_task
 end
@@ -13,7 +13,7 @@ namespace :test do
     # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
   end
 
-  task :run => ['test:units', 'test:functionals', 'test:generators', 'test:integration']
+  task :run => ['test:units', 'test:functionals', 'test:generators', 'test:integration', 'test:jobs']
 
   # Inspired by: http://ngauthier.com/2012/02/quick-tests-with-bash.html
   desc "Run tests quickly by merging all types and not resetting db"
@@ -28,7 +28,7 @@ namespace :test do
 
   Rails::TestTask.new(single: "test:prepare")
 
-  ["models", "helpers", "controllers", "mailers", "integration"].each do |name|
+  ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name|
     Rails::TestTask.new(name => "test:prepare") do |t|
       t.pattern = "test/#{name}/**/*_test.rb"
     end
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 118f22995e..032b11a95f 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -109,6 +109,17 @@ module ApplicationTests
       end
     end
 
+    def test_run_jobs
+      create_test_file :jobs, 'foo_job'
+      create_test_file :jobs, 'bar_job'
+      create_test_file :models, 'foo'
+      run_test_jobs_command.tap do |output|
+        assert_match "FooJobTest", output
+        assert_match "BarJobTest", output
+        assert_match "2 runs, 2 assertions, 0 failures", output
+      end
+    end
+
     def test_run_functionals
       create_test_file :mailers, 'foo_mailer'
       create_test_file :controllers, 'bar_controller'
@@ -132,11 +143,11 @@ module ApplicationTests
     end
 
     def test_run_all_suites
-      suites = [:models, :helpers, :unit, :controllers, :mailers, :functional, :integration]
+      suites = [:models, :helpers, :unit, :controllers, :mailers, :functional, :integration, :jobs]
       suites.each { |suite| create_test_file suite, "foo_#{suite}" }
       run_test_command('') .tap do |output|
         suites.each { |suite| assert_match "Foo#{suite.to_s.camelize}Test", output }
-        assert_match "7 runs, 7 assertions, 0 failures", output
+        assert_match "8 runs, 8 assertions, 0 failures", output
       end
     end
 
@@ -245,7 +256,7 @@ module ApplicationTests
       def run_test_command(arguments = 'test/unit/test_test.rb')
         run_task ['test', arguments]
       end
-      %w{ mailers models helpers units controllers functionals integration }.each do |type|
+      %w{ mailers models helpers units controllers functionals integration jobs }.each do |type|
         define_method("run_test_#{type}_command") do
           run_task ["test:#{type}"]
         end