Merge remote-tracking branch 'origin/pr/460'

Conflicts: lib/delayed/backend/base.rb
collectiveidea · Sep 24, 2014 · 6c64064 · 6c64064
2 parents acdda42 + d1f53b4
commit 6c64064
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/delayed/backend/base.rb b/lib/delayed/backend/base.rb
@@ -83,7 +83,7 @@ def payload_object=(object)
 
       def payload_object
         @payload_object ||= YAML.load_dj(handler)
-      rescue TypeError, LoadError, NameError, ArgumentError => e
+      rescue TypeError, LoadError, NameError, ArgumentError, SyntaxError, Psych::SyntaxError => e
         raise DeserializationError, "Job failed to load: #{e.message}. Handler: #{handler.inspect}"
       end
 

diff --git a/lib/delayed/backend/shared_spec.rb b/lib/delayed/backend/shared_spec.rb
@@ -189,6 +189,14 @@ def create_job(opts = {})
       expect(YAML).to receive(:load_dj).and_raise(ArgumentError)
       expect { job.payload_object }.to raise_error(Delayed::DeserializationError)
     end
+
+    it 'raises a DeserializationError when the YAML.load raises syntax error' do
+      # only test with Psych since the other YAML parsers don't raise a SyntaxError
+      if YAML.parser.class.name !~ /syck|yecht/i
+        job = described_class.new :handler => 'message: "no ending quote'
+        expect { job.payload_object }.to raise_error(Delayed::DeserializationError)
+      end
+    end
   end
 
   describe 'reserve' do