From 1feb99712245f25445eda4f8fb0437d45ed318af Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Thu, 27 Apr 2017 15:08:10 +1000 Subject: [PATCH] enqueue directly --- app/controllers/discourse_donations/charges_controller.rb | 2 +- app/jobs/award_group.rb | 5 +++-- .../discourse_donations/charges_controller_spec.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb index 720e9d7..492d242 100644 --- a/app/controllers/discourse_donations/charges_controller.rb +++ b/app/controllers/discourse_donations/charges_controller.rb @@ -26,7 +26,7 @@ module DiscourseDonations end else if group_name.present? - Jobs.enqueue_in(1.minute, :award_group, email: email) + Jobs.enqueue(:award_group, email: email, group_name: group_name) end end diff --git a/app/jobs/award_group.rb b/app/jobs/award_group.rb index 1c69eb9..ca02ce6 100644 --- a/app/jobs/award_group.rb +++ b/app/jobs/award_group.rb @@ -3,14 +3,15 @@ module Jobs class AwardGroup def perform(args) - puts '======================The Job was performed===========================' + puts '====================== The Job was performed ===========================' end def self.perform_in(arg, opts) - puts '======================The Job was enqueued===========================' + puts '====================== The Job was enqueued ===========================' end def execute(args) + puts '====================== The Job was executed ===========================' user = User.find_by_email(args[:email]) if user.present? DiscourseDonations::Rewards.new(user).add_to_group(args[:group_name]) diff --git a/spec/controllers/discourse_donations/charges_controller_spec.rb b/spec/controllers/discourse_donations/charges_controller_spec.rb index 2ba0d01..5813e85 100644 --- a/spec/controllers/discourse_donations/charges_controller_spec.rb +++ b/spec/controllers/discourse_donations/charges_controller_spec.rb @@ -50,7 +50,7 @@ module DiscourseDonations end it 'enqueues add to group' do - Jobs.expects(:enqueue_in).with(1.minute, :award_group, email: params[:email]) + Jobs.expects(:enqueue).with(:award_group, email: params[:email], group_name: group_name) post :create, params end