Fix tests with delayed_job differences

Testing the difference of the exact job instead of all jobs. Also including class methods on Delayed::Job to fetch jobs by_handler and with handler_like (using sql LIKE).

Fix tests with delayed_job differences
Testing the difference of the exact job instead of all jobs. Also including class methods on Delayed::Job to fetch jobs by_handler and with handler_like (using sql LIKE).
Rodrigo Souto
1 parent 73f72960
Showing 4 changed files with 32 additions and 16 deletions Show diff stats
app/models/person_notifier.rb
config/initializers/delayed_job_config.rb
test/functional/invite_controller_test.rb
test/unit/person_notifier_test.rb
@@ -36,7 +36,7 @@ class PersonNotifier
   class NotifyAllJob
     def self.exists?
-      Delayed::Job.where(:handler => "--- !ruby/object:PersonNotifier::NotifyAllJob {}\n").count > 0
+      Delayed::Job.by_handler("--- !ruby/object:PersonNotifier::NotifyAllJob {}\n").count > 0
     end
     def perform
@@ -51,7 +51,7 @@ class PersonNotifier
     end
     def self.find(person_id)
-      Delayed::Job.where(:handler => "--- !ruby/struct:PersonNotifier::NotifyJob\nperson_id: #{person_id}\n")
+      Delayed::Job.by_handler("--- !ruby/struct:PersonNotifier::NotifyJob\nperson_id: #{person_id}\n")
     end
     def perform
@@ -2,6 +2,16 @@ require &#39;delayed_job&#39;
 Delayed::Worker.backend = :active_record
 Delayed::Worker.max_attempts = 2
+class Delayed::Job
+  def self.handler_like(handler)
+    Delayed::Job.where("handler LIKE '%#{handler}%'")
+  end
+
+  def self.by_handler(handler)
+    Delayed::Job.where(:handler => handler)
+  end
+end
+
 # TODO This is consuming ton of space on development with a postgres connection
 # error on the jobs. This must be verified before going into production.
 # Logging jobs backtraces
@@ -231,7 +231,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     contact_list = ContactList.create
     post :select_friends, :profile => profile.identifier, :manual_import_addresses => "#{friend.name} <#{friend.email}>", :import_from => "manual", :mail_template => "click: <url>", :contact_list => contact_list.id
-    job = Delayed::Job.where("handler LIKE '%InvitationJob%'").first
+    job = Delayed::Job.handler_like(InvitationJob.name).first
     assert_equal 'pt', job.payload_object.locale
   end
@@ -34,14 +34,14 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
   should 'do not send mail if do not have notifications' do
     @community.add_member(@member)
     ActionTracker::Record.delete_all
-    assert_no_difference ActionMailer::Base.deliveries, :count do
+    assert_no_difference 'ActionMailer::Base.deliveries.count' do
       notify
     end
   end
   should 'do not send mail to people not joined to community' do
     Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
-    assert_no_difference ActionMailer::Base.deliveries, :count do
+    assert_no_difference 'ActionMailer::Base.deliveries.count' do
       notify
     end
   end
@@ -60,7 +60,7 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
     ActionTracker::Record.delete_all
     comment = Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article )
     @member.last_notification = DateTime.now + 1.day
-    assert_no_difference ActionMailer::Base.deliveries, :count do
+    assert_no_difference 'ActionMailer::Base.deliveries.count' do
       notify
     end
   end
@@ -85,7 +85,7 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
     @member.notification_time = 12
     time = Time.now
     @member.notifier.schedule_next_notification_mail
-    job = Delayed::Job.where("handler like '%PersonNotifier::NotifyJob%'").last
+    job = Delayed::Job.handler_like(PersonNotifier::NotifyJob.name).last
     assert job.run_at >= time + @member.notification_time.hours
     assert job.run_at < time + (@member.notification_time+1).hours
   end
@@ -93,14 +93,14 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
   should 'do not schedule duplicated notification mail' do
     @member.notification_time = 12
     @member.notifier.schedule_next_notification_mail
-    assert_no_difference 'Delayed::Job.count' do
+    assert_no_difference 'job_count(PersonNotifier::NotifyJob)' do
       @member.notifier.schedule_next_notification_mail
     end
   end
   should 'do not schedule next mail if notification time is zero' do
     @member.notification_time = 0
-    assert_no_difference 'Delayed::Job.count' do
+    assert_no_difference 'job_count(PersonNotifier::NotifyJob)' do
       @member.notifier.schedule_next_notification_mail
     end
   end
@@ -118,17 +118,17 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
   should 'do not create duplicated job' do
     PersonNotifier.schedule_all_next_notification_mail
-    assert_no_difference 'Delayed::Job.count' do
+    assert_no_difference 'job_count(PersonNotifier::NotifyJob)' do
       PersonNotifier.schedule_all_next_notification_mail
     end
   end
   should 'schedule after update and set a valid notification time' do
-    assert_no_difference 'Delayed::Job.count' do
+    assert_no_difference 'job_count(PersonNotifier::NotifyJob)' do
       @member.notification_time = 0
       @member.save!
     end
-    assert_difference 'Delayed::Job.count', 1 do
+    assert_difference 'job_count(PersonNotifier::NotifyJob)', 1 do
       @member.notification_time = 12
       @member.save!
     end
@@ -136,16 +136,16 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
   should 'reschedule with changed notification time' do
     time = Time.now
-    assert_difference Delayed::Job, :count, 1 do
+    assert_difference 'job_count(PersonNotifier::NotifyJob)', 1 do
       @member.notification_time = 2
       @member.save!
     end
-    assert_no_difference Delayed::Job, :count do
+    assert_no_difference 'job_count(PersonNotifier::NotifyJob)' do
       @member.notification_time = 12
       @member.save!
     end
     @member.notifier.schedule_next_notification_mail
-    job = Delayed::Job.where("handler like '%PersonNotifier::NotifyJob%'").last
+    job = Delayed::Job.handler_like(PersonNotifier::NotifyJob.name).last
     assert job.run_at >= time + @member.notification_time.hours
     assert job.run_at < time + (@member.notification_time+1).hours
   end
@@ -197,7 +197,7 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
   end
   should 'perform create NotifyJob for all users with notification_time' do
-    assert_difference Delayed::Job, :count, 2 do
+    assert_difference 'job_count(PersonNotifier::NotifyJob)', 2 do
       Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
       process_delayed_job_queue
     end
@@ -225,8 +225,14 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
     assert !jobs.select {|j| !j.failed? && j.last_error.nil? }.empty?
   end
+  private
+
   def notify
     @member.notifier.notify
   end
+  def job_count(job)
+    Delayed::Job.handler_like(job.name).count
+  end
+
 end
	@@ -36,7 +36,7 @@ class PersonNotifier		@@ -36,7 +36,7 @@ class PersonNotifier
36		36
37	class NotifyAllJob	37	class NotifyAllJob
38	def self.exists?	38	def self.exists?
39	- Delayed::Job.where(:handler => "--- !ruby/object:PersonNotifier::NotifyAllJob {}\n").count > 0	39	+ Delayed::Job.by_handler("--- !ruby/object:PersonNotifier::NotifyAllJob {}\n").count > 0
40	end	40	end
41		41
42	def perform	42	def perform
	@@ -51,7 +51,7 @@ class PersonNotifier		@@ -51,7 +51,7 @@ class PersonNotifier
51	end	51	end
52		52
53	def self.find(person_id)	53	def self.find(person_id)
54	- Delayed::Job.where(:handler => "--- !ruby/struct:PersonNotifier::NotifyJob\nperson_id: #{person_id}\n")	54	+ Delayed::Job.by_handler("--- !ruby/struct:PersonNotifier::NotifyJob\nperson_id: #{person_id}\n")
55	end	55	end
56		56
57	def perform	57	def perform
	@@ -2,6 +2,16 @@ require 'delayed_job'		@@ -2,6 +2,16 @@ require 'delayed_job'
2	Delayed::Worker.backend = :active_record	2	Delayed::Worker.backend = :active_record
3	Delayed::Worker.max_attempts = 2	3	Delayed::Worker.max_attempts = 2
4		4
		5	+class Delayed::Job
		6	+ def self.handler_like(handler)
		7	+ Delayed::Job.where("handler LIKE '%#{handler}%'")
		8	+ end
		9	+
		10	+ def self.by_handler(handler)
		11	+ Delayed::Job.where(:handler => handler)
		12	+ end
		13	+end
		14	+
5	# TODO This is consuming ton of space on development with a postgres connection	15	# TODO This is consuming ton of space on development with a postgres connection
6	# error on the jobs. This must be verified before going into production.	16	# error on the jobs. This must be verified before going into production.
7	# Logging jobs backtraces	17	# Logging jobs backtraces
	@@ -231,7 +231,7 @@ class InviteControllerTest < ActionController::TestCase		@@ -231,7 +231,7 @@ class InviteControllerTest < ActionController::TestCase
231		231
232	contact_list = ContactList.create	232	contact_list = ContactList.create
233	post :select_friends, :profile => profile.identifier, :manual_import_addresses => "#{friend.name} <#{friend.email}>", :import_from => "manual", :mail_template => "click: <url>", :contact_list => contact_list.id	233	post :select_friends, :profile => profile.identifier, :manual_import_addresses => "#{friend.name} <#{friend.email}>", :import_from => "manual", :mail_template => "click: <url>", :contact_list => contact_list.id
234	- job = Delayed::Job.where("handler LIKE '%InvitationJob%'").first	234	+ job = Delayed::Job.handler_like(InvitationJob.name).first
235	assert_equal 'pt', job.payload_object.locale	235	assert_equal 'pt', job.payload_object.locale
236	end	236	end
237		237