Merge c501428 into b8ff983

collectiveidea · Apr 1, 2013 · a0990e8 · a0990e8
2 parents b8ff983 + c501428
commit a0990e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/delayed/backend/active_record.rb b/lib/delayed/backend/active_record.rb
@@ -9,6 +9,9 @@ class Job < ::ActiveRecord::Base
 
         scope :by_priority, lambda { order('priority ASC, run_at ASC') }
 
+        attr_accessible :priority, :run_at, :queue, :payload_object,
+                        :failed_at, :locked_at, :locked_by
+
         before_save :set_default_run_at
 
         def self.set_delayed_job_table_name

diff --git a/spec/delayed/backend/active_record_spec.rb b/spec/delayed/backend/active_record_spec.rb
@@ -43,6 +43,21 @@
     end
   end
 
+  context "ActiveRecord::Base.send(:attr_accessible, nil)" do
+    before do
+      Delayed::Backend::ActiveRecord::Job.send(:attr_accessible, nil)
+    end
+
+    after do
+      Delayed::Backend::ActiveRecord::Job.send(:attr_accessible, *Delayed::Backend::ActiveRecord::Job.new.attributes.keys)
+    end
+
+    it "is still accessible" do
+      job = Delayed::Backend::ActiveRecord::Job.enqueue :payload_object => EnqueueJobMod.new
+      expect(Delayed::Backend::ActiveRecord::Job.find(job.id).handler).to_not be_blank
+    end
+  end
+
   context "ActiveRecord::Base.table_name_prefix" do
     it "when prefix is not set, use 'delayed_jobs' as table name" do
       ::ActiveRecord::Base.table_name_prefix = nil