gistfile1.diff

diff --git a/lib/delayed/backend/shared_spec.rb b/lib/delayed/backend/shared_spec.rb
index 8dc94eb..822da9a 100644
--- a/lib/delayed/backend/shared_spec.rb
+++ b/lib/delayed/backend/shared_spec.rb
@@ -279,29 +279,6 @@ shared_examples_for "a delayed_job backend" do
     end
   end
 
-  context "worker read-ahead" do
-    before do
-      @read_ahead = Delayed::Worker.read_ahead
-    end
-
-    after do
-      Delayed::Worker.read_ahead = @read_ahead
-    end
-
-    it "reads five jobs" do
-      pending
-      described_class.should_receive(:find_available).with(anything, 5, anything).and_return([])
-      described_class.reserve(worker)
-    end
-
-    it "reads a configurable number of jobs" do
-      pending
-      Delayed::Worker.read_ahead = 15
-      described_class.should_receive(:find_available).with(anything, Delayed::Worker.read_ahead, anything).and_return([])
-      described_class.reserve(worker)
-    end
-  end
-
   context "clear_locks!" do
     before do
       @job = create_job(:locked_by => 'worker1', :locked_at => described_class.db_time_now)
@@ -418,11 +395,12 @@ shared_examples_for "a delayed_job backend" do
     end
 
     it "raises error ArgumentError the record is not persisted" do
-      pending
       story = Story.new(:text => 'hello')
-      expect {
-        story.delay.tell
-      }.to raise_error(ArgumentError, "Jobs cannot be created for records before they've been persisted")
+      if story.respond_to?(:new_record?)
+        expect {
+          story.delay.tell
+        }.to raise_error(ArgumentError, "Jobs cannot be created for records before they've been persisted")
+      end
     end
 
     it "raises deserialization error for destroyed records" do
@@ -486,7 +464,6 @@ shared_examples_for "a delayed_job backend" do
       end
 
       it "re-schedules jobs after failing" do
-        pending
         worker.work_off
         @job.reload
         expect(@job.last_error).to match(/did not work/)
diff --git a/lib/delayed/performable_method.rb b/lib/delayed/performable_method.rb
index 60edd18..40aaf68 100644
--- a/lib/delayed/performable_method.rb
+++ b/lib/delayed/performable_method.rb
@@ -9,8 +9,8 @@ module Delayed
     def initialize(object, method_name, args)
       raise NoMethodError, "undefined method `#{method_name}' for #{object.inspect}" unless object.respond_to?(method_name, true)
 
-      if defined?(ActiveRecord) && object.kind_of?(ActiveRecord::Base)
-        raise(ArgumentError, 'Jobs cannot be created for records before they\'ve been persisted') if object.attributes[object.class.primary_key].nil?
+      if object.respond_to?(:new_record?) && object.new_record?
+        raise(ArgumentError, 'Jobs cannot be created for records before they\'ve been persisted')
       end
 
       self.object       = object
diff --git a/spec/worker_spec.rb b/spec/worker_spec.rb
index d17dd40..8507707 100644
--- a/spec/worker_spec.rb
+++ b/spec/worker_spec.rb
@@ -16,4 +16,25 @@ describe Delayed::Worker do
       expect(Delayed::Worker.backend).to eq(Delayed::Backend::Test::Job)
     end
   end
+
+  context "worker read-ahead" do
+    before do
+      @read_ahead = Delayed::Worker.read_ahead
+    end
+
+    after do
+      Delayed::Worker.read_ahead = @read_ahead
+    end
+
+    it "reads five jobs" do
+      Delayed::Job.should_receive(:find_available).with(anything, 5, anything).and_return([])
+      Delayed::Job.reserve(Delayed::Worker.new)
+    end
+
+    it "reads a configurable number of jobs" do
+      Delayed::Worker.read_ahead = 15
+      Delayed::Job.should_receive(:find_available).with(anything, Delayed::Worker.read_ahead, anything).and_return([])
+      Delayed::Job.reserve(Delayed::Worker.new)
+    end
+  end
 end