Merge pull request #6735 from coopdevs/enable-mail-delivery-always

Enable mail delivery always

app/models/spree/app_configuration.rb

@@ -92,7 +92,6 @@ module Spree
     preference :s3_host_alias, :string
 
     # Default mail headers settings
-    preference :enable_mail_delivery, :boolean, default: false
     preference :mails_from, :string, default: 'ofn@example.com'
     preference :mail_bcc, :string, default: 'ofn@example.com'
     preference :intercept_email, :string, default: nil

app/views/spree/admin/mail_methods/_form.html.haml

@@ -2,9 +2,6 @@
   .row
     %fieldset.no-border-bottom
       %legend{align: "center"}= t("spree.general")
-      .field
-        = preference_field_tag("enable_mail_delivery", Spree::Config[:enable_mail_delivery], type: :boolean)
-        = label_tag :enable_mail_delivery, t("spree.enable_mail_delivery")
       .field
         = label_tag :mails_from, t("spree.send_mails_as")
         %br/

db/migrate/20210125123000_remove_enable_mail_delivery_preference.rb

@@ -0,0 +1,8 @@
+class RemoveEnableMailDeliveryPreference < ActiveRecord::Migration
+  def up
+    Spree::Preference.delete_all("key ilike '%enable_mail_delivery%'")
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20210115143738) do
+ActiveRecord::Schema.define(version: 20210125123000) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

db/seeds.rb

@@ -4,7 +4,6 @@ require 'yaml'
 
 def set_mail_configuration
   MailConfiguration.entries= {
-    enable_mail_delivery: true,
     mail_host: ENV.fetch('MAIL_HOST'),
     mail_domain: ENV.fetch('MAIL_DOMAIN'),
     mail_port: ENV.fetch('MAIL_PORT'),

lib/spree/core/mail_settings.rb

@@ -12,13 +12,9 @@ module Spree
       end
 
       def override!
-        if Config.enable_mail_delivery
-          ActionMailer::Base.default_url_options[:host] ||= Config.site_url
-          ActionMailer::Base.smtp_settings = mail_server_settings
-          ActionMailer::Base.perform_deliveries = true
-        else
-          ActionMailer::Base.perform_deliveries = false
-        end
+        ActionMailer::Base.default_url_options[:host] ||= Config.site_url
+        ActionMailer::Base.smtp_settings = mail_server_settings
+        ActionMailer::Base.perform_deliveries = true
       end
 
       private

spec/controllers/spree/admin/mail_methods_controller_spec.rb

@@ -10,7 +10,7 @@ describe Spree::Admin::MailMethodsController do
   context "#update" do
     it "should reinitialize the mail settings" do
       expect(Spree::Core::MailSettings).to receive(:init)
-      spree_put :update, enable_mail_delivery: "1", mails_from: "ofn@example.com"
+      spree_put :update, mails_from: "ofn@example.com"
     end
   end
 
@@ -24,7 +24,6 @@ describe Spree::Admin::MailMethodsController do
                                     has_spree_role?: true,
                                     locale: nil)
     allow(controller).to receive_messages(spree_current_user: user)
-    Spree::Config[:enable_mail_delivery] = "1"
     ActionMailer::Base.perform_deliveries = true
 
     expect {

spec/lib/spree/core/mail_settings_spec.rb

@@ -7,60 +7,47 @@ module Spree
     describe MailSettings do
       let!(:subject) { MailSettings.new }
 
-      context "enable delivery" do
-        before { Config.enable_mail_delivery = true }
-
-        context "overrides appplication defaults" do
-          context "authentication method is none" do
-            before do
-              Config.mail_host = "smtp.example.com"
-              Config.mail_domain = "example.com"
-              Config.mail_port = 123
-              Config.mail_auth_type = MailSettings::SECURE_CONNECTION_TYPES[0]
-              Config.smtp_username = "schof"
-              Config.smtp_password = "hellospree!"
-              Config.secure_connection_type = "TLS"
-              subject.override!
-            end
-
-            it { expect(ActionMailer::Base.smtp_settings[:address]).to eq "smtp.example.com" }
-            it { expect(ActionMailer::Base.smtp_settings[:domain]).to eq "example.com" }
-            it { expect(ActionMailer::Base.smtp_settings[:port]).to eq 123 }
-            it { expect(ActionMailer::Base.smtp_settings[:authentication]).to eq "None" }
-            it { expect(ActionMailer::Base.smtp_settings[:enable_starttls_auto]).to be_truthy }
-
-            it "doesnt touch user name config" do
-              expect(ActionMailer::Base.smtp_settings[:user_name]).to be_nil
-            end
-
-            it "doesnt touch password config" do
-              expect(ActionMailer::Base.smtp_settings[:password]).to be_nil
-            end
-          end
-        end
-
-        context "when mail_auth_type is other than none" do
+      context "overrides appplication defaults" do
+        context "authentication method is none" do
           before do
-            Config.mail_auth_type = "login"
+            Config.mail_host = "smtp.example.com"
+            Config.mail_domain = "example.com"
+            Config.mail_port = 123
+            Config.mail_auth_type = MailSettings::SECURE_CONNECTION_TYPES[0]
             Config.smtp_username = "schof"
             Config.smtp_password = "hellospree!"
+            Config.secure_connection_type = "TLS"
             subject.override!
           end
 
-          context "overrides user credentials" do
-            it { expect(ActionMailer::Base.smtp_settings[:user_name]).to eq "schof" }
-            it { expect(ActionMailer::Base.smtp_settings[:password]).to eq "hellospree!" }
+          it { expect(ActionMailer::Base.smtp_settings[:address]).to eq "smtp.example.com" }
+          it { expect(ActionMailer::Base.smtp_settings[:domain]).to eq "example.com" }
+          it { expect(ActionMailer::Base.smtp_settings[:port]).to eq 123 }
+          it { expect(ActionMailer::Base.smtp_settings[:authentication]).to eq "None" }
+          it { expect(ActionMailer::Base.smtp_settings[:enable_starttls_auto]).to be_truthy }
+
+          it "doesnt touch user name config" do
+            expect(ActionMailer::Base.smtp_settings[:user_name]).to be_nil
+          end
+
+          it "doesnt touch password config" do
+            expect(ActionMailer::Base.smtp_settings[:password]).to be_nil
           end
         end
       end
 
-      context "do not enable delivery" do
+      context "when mail_auth_type is other than none" do
         before do
-          Config.enable_mail_delivery = false
+          Config.mail_auth_type = "login"
+          Config.smtp_username = "schof"
+          Config.smtp_password = "hellospree!"
           subject.override!
         end
 
-        it { expect(ActionMailer::Base.perform_deliveries).to be_falsy }
+        context "overrides user credentials" do
+          it { expect(ActionMailer::Base.smtp_settings[:user_name]).to eq "schof" }
+          it { expect(ActionMailer::Base.smtp_settings[:password]).to eq "hellospree!" }
+        end
       end
     end
   end