merge master

.github/issue_template.md

@@ -1,4 +1,9 @@
 Ruby version:
 Sidekiq / Pro / Enterprise version(s):
 
-If relevant, please include your initializer and any error message with the full backtrace.
+Please include your initializer and any error message with the full backtrace.
+
+Are you using an old version?
+Have you checked the changelog to see if your issue has been fixed in a later version?
+
+https://github.com/mperham/sidekiq/blob/master/Changes.md

Changes.md

@@ -18,7 +18,7 @@ Sidekiq::Middleware::Server::Logging -> Sidekiq::JobLogging
 - Rails 3.2 and Ruby 2.0 and 2.1 are no longer supported.
 - Please see the [5.0 Upgrade notes](5.0-Upgrade.md) for more detail.
 
-master
+4.2.10
 -----------
 
 - Scheduled jobs can now be moved directly to the Dead queue via API [#3390]

Pro-Changes.md

@@ -6,6 +6,8 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
 HEAD
 ---------
 
+- Batch page displays Pending JIDs if less than 10 [#3130]
+- Batch page has a Search button to find associated Retries [#3130]
 - Make Batch UI progress bar more friendly to the colorblind [#3387]
 
 3.4.5

lib/sidekiq/testing.rb

@@ -317,7 +317,7 @@ module Sidekiq
   end
 end
 
-if defined?(::Rails) && !Rails.env.test?
+if defined?(::Rails) && Rails.respond_to?(:env) && !Rails.env.test?
   puts("**************************************************")
   puts("⛔️ WARNING: Sidekiq testing API enabled, but this is not the test environment.  Your jobs will not go to Redis.")
   puts("**************************************************")

test/test_api.rb

@@ -309,12 +309,13 @@ class TestApi < Sidekiq::Test
         refute_nil Sidekiq::ScheduledSet.new.find_job(remain_id)
       end
 
-      it 'can find job by id in sorted sets' do
+      it 'can kill a scheduled job' do
         job_id = ApiWorker.perform_in(100, 1, 'jason')
         job = Sidekiq::ScheduledSet.new.find_job(job_id)
-        refute_nil job
-        assert_equal job_id, job.jid
-        assert_in_delta job.latency, 0.0, 0.1
+        ds = Sidekiq::DeadSet.new
+        assert_equal 0, ds.size
+        refute_nil job.kill
+        assert_equal 1, ds.size
       end
 
       it 'can remove jobs when iterating over a sorted set' do

test/test_web.rb

@@ -547,6 +547,13 @@ class TestWeb < Sidekiq::Test
         assert_equal 'http://example.org/morgue', last_response.header['Location']
       end
 
+      it 'can display a dead job' do
+        params = add_dead
+        get "/morgue/#{job_params(*params)}"
+        assert_equal 200, last_response.status
+        snapshot(page, name: 'Dead Job Page')
+      end
+
       it 'can retry a dead job' do
         params = add_dead
         post "/morgue/#{job_params(*params)}", 'retry' => 'Retry'