fix displaying job handler/last_error details for failed jobs

The change to load these details on demand didn't know how to properly
handle failed jobs.

test plan: go to /jobs as a site admin, filter by failed jobs, select
one, you should be able to view the handler and last error details.

Change-Id: Ibb7cdd768726a4952d29d3185f8e4524eae3f064
Reviewed-on: https://gerrit.instructure.com/15595
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>

Author: codekitchen

app/coffeescripts/jobs.coffee

@@ -198,7 +198,7 @@ define [
       if !selected_job || selected_job.handler
         cb()
       else
-        $.ajaxJSON "#{@options.job_url}/#{selected_job.id}", "GET", {}, (data) =>
+        $.ajaxJSON "#{@options.job_url}/#{selected_job.id}", "GET", {flavor: @options.flavor}, (data) =>
           selected_job.handler = data.handler
           selected_job.last_error = data.last_error
           fillin_job_data(selected_job)

app/controllers/jobs_controller.rb

@@ -35,7 +35,12 @@ def index
   end
 
   def show
-    render :json => Delayed::Job.find(params[:id]).to_json(:include_root => false)
+    if params[:flavor] == 'failed'
+      job = Delayed::Job::Failed.find(params[:id])
+    else
+      job = Delayed::Job.find(params[:id])
+    end
+    render :json => job.to_json(:include_root => false)
   end
 
   def batch_update

spec/selenium/admin/site_admin_jobs_spec.rb

@@ -59,7 +59,7 @@ def filter_tags(tag_flavor_text)
       2.times { "present".send_later :reverse }
       "future".send_at Time.now + 30.days, :capitalize
       job = "failure".send_at Time.now, :downcase
-      job.fail!
+      @failed_job = job.fail!
     end
     @all_jobs = created_jobs.dup
     # tweak these settings to speed up the test run
@@ -89,6 +89,16 @@ def filter_tags(tag_flavor_text)
       fj('#job-handler-show').click()
       wait_for_ajax_requests
       get_value('#job-handler').should == job.handler
+      fj('a.ui-dialog-titlebar-close').click()
+
+      # also for failed job
+      filter_jobs(FlavorTags::FAILED)
+      wait_for_ajax_requests
+      fj('#jobs-grid .slick-row .l0.r0').click()
+      fj('#job-id').text.should == @failed_job.id.to_s
+      fj('#job-handler-show').click()
+      wait_for_ajax_requests
+      get_value('#job-handler').should == @failed_job.handler
     end
 
     context "all jobs" do

vendor/plugins/delayed_job/lib/delayed/backend/active_record.rb

@@ -324,8 +324,9 @@ def fail!
           attrs['failed_at'] ||= self.class.db_time_now
           attrs.delete('next_in_strand')
           self.class.transaction do
-            Failed.create(attrs)
+            failed_job = Failed.create(attrs)
             self.destroy
+            failed_job
           end
         rescue
           # we got an error while failing the job -- we need to at least get

vendor/plugins/delayed_job/lib/delayed/backend/redis/job.rb

@@ -353,6 +353,7 @@ def fail!
     save!
     redis.rename Keys::JOB[id], Keys::FAILED_JOB[id]
     tickle_strand
+    self
   end
 
   protected