mailer worker always runs, but only delivers if email is enabled #2070

app/jobs/enhanced_mail_delivery_job.rb

@@ -7,4 +7,10 @@ class EnhancedMailDeliveryJob < ActionMailer::MailDeliveryJob
     Seek::Config.smtp_propagate
     Seek::Config.site_base_host_propagate
   end
+
+  around_perform do |_job, block|
+    if Seek::Config.email_enabled
+      block.call
+    end
+  end
 end

app/views/admin/_email.html.erb

@@ -55,6 +55,7 @@
         <%= link_to '#', id: 'queue-test-email-btn', class: 'btn btn-default' do %>
           <%= image("test", title: "Send testing email", alt: "Test")%> Queue test email
         <% end %>
+        <p class="help-block">Note that testing the Queue requires settings to be saved first</p>
         <div id='ajax_loader_position'></div>
       <% end %>
     </div>

lib/seek/workers.rb

@@ -18,7 +18,7 @@ def self.daemonize_commands(commands)
     def self.create_commands(action)
       commands = []
       queues = [QueueNames::DEFAULT]
-      queues << QueueNames::MAILERS if Seek::Config.email_enabled
+      queues << QueueNames::MAILERS
       queues << QueueNames::AUTH_LOOKUP if Seek::Config.auth_lookup_enabled
       queues << QueueNames::REMOTE_CONTENT if Seek::Config.cache_remote_files
       queues << QueueNames::SAMPLES if Seek::Config.samples_enabled

test/unit/jobs/enhanced_mail_delivery_job_test.rb

@@ -26,4 +26,20 @@ class EnhancedMailDeliveryJobTest < ActiveSupport::TestCase
       assert site_base_host_propagate_called
     end
   end
+
+  test 'perform with email disabled' do
+    with_config_value(:email_enabled, true) do
+      assert_enqueued_jobs(1, only: EnhancedMailDeliveryJob, queue: QueueNames::MAILERS) do
+        Mailer.test_email('fred@email.com').deliver_later
+      end
+    end
+
+    with_config_value(:email_enabled, false) do
+      assert_emails 0 do
+        assert_performed_jobs(1, only: EnhancedMailDeliveryJob) do
+          Mailer.test_email('fred@email.com').deliver_later
+        end
+      end
+    end
+  end
 end