aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailbox/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailbox/lib')
-rw-r--r--actionmailbox/lib/action_mailbox/engine.rb11
-rw-r--r--actionmailbox/lib/action_mailbox/test_helper.rb12
-rw-r--r--actionmailbox/lib/rails/generators/installer.rb2
3 files changed, 8 insertions, 17 deletions
diff --git a/actionmailbox/lib/action_mailbox/engine.rb b/actionmailbox/lib/action_mailbox/engine.rb
index 039f04ac2f..bab3964d93 100644
--- a/actionmailbox/lib/action_mailbox/engine.rb
+++ b/actionmailbox/lib/action_mailbox/engine.rb
@@ -26,16 +26,7 @@ module ActionMailbox
ActionMailbox.incinerate = app.config.action_mailbox.incinerate.nil? ? true : app.config.action_mailbox.incinerate
ActionMailbox.incinerate_after = app.config.action_mailbox.incinerate_after || 30.days
ActionMailbox.queues = app.config.action_mailbox.queues || {}
- end
- end
-
- initializer "action_mailbox.ingress" do |app|
- config.to_prepare do
- if ActionMailbox.ingress = app.config.action_mailbox.ingress.presence
- if ingress_controller_class = "ActionMailbox::Ingresses::#{ActionMailbox.ingress.to_s.classify}::InboundEmailsController".safe_constantize
- ingress_controller_class.prepare
- end
- end
+ ActionMailbox.ingress = app.config.action_mailbox.ingress
end
end
end
diff --git a/actionmailbox/lib/action_mailbox/test_helper.rb b/actionmailbox/lib/action_mailbox/test_helper.rb
index 0ec9152844..d248fa8734 100644
--- a/actionmailbox/lib/action_mailbox/test_helper.rb
+++ b/actionmailbox/lib/action_mailbox/test_helper.rb
@@ -29,16 +29,16 @@ module ActionMailbox
create_inbound_email_from_fixture(*args).tap(&:route)
end
- # Create an +InboundEmail+ from fixture using the same arguments as +create_inbound_email_from_mail+
- # and immediately route it to processing.
+ # Create an +InboundEmail+ using the same arguments as +create_inbound_email_from_mail+ and immediately route it to
+ # processing.
def receive_inbound_email_from_mail(**kwargs)
create_inbound_email_from_mail(**kwargs).tap(&:route)
end
- # Create an +InboundEmail+ from fixture using the same arguments as +create_inbound_email_from_source+
- # and immediately route it to processing.
- def receive_inbound_email_from_source(**kwargs)
- create_inbound_email_from_source(**kwargs).tap(&:route)
+ # Create an +InboundEmail+ using the same arguments as +create_inbound_email_from_source+ and immediately route it
+ # to processing.
+ def receive_inbound_email_from_source(*args)
+ create_inbound_email_from_source(*args).tap(&:route)
end
end
end
diff --git a/actionmailbox/lib/rails/generators/installer.rb b/actionmailbox/lib/rails/generators/installer.rb
index 25cf528ef5..2864ea4e62 100644
--- a/actionmailbox/lib/rails/generators/installer.rb
+++ b/actionmailbox/lib/rails/generators/installer.rb
@@ -5,6 +5,6 @@ copy_file "#{__dir__}/mailbox/templates/application_mailbox.rb", "app/mailboxes/
environment <<~end_of_config, env: "production"
# Prepare the ingress controller used to receive mail
- # config.action_mailbox.ingress = :amazon
+ # config.action_mailbox.ingress = :postfix
end_of_config