From 91c2e6a1af11f860053e31c2713cab890fc2d901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Fri, 10 May 2024 14:16:56 +0200 Subject: [PATCH] Remove unecessary ApplicationMailer for system module --- .../decidim/system/application_mailer.rb | 12 ------ .../decidim/system/application_mailer_spec.rb | 38 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 decidim-system/app/mailers/decidim/system/application_mailer.rb delete mode 100644 decidim-system/spec/mailers/decidim/system/application_mailer_spec.rb diff --git a/decidim-system/app/mailers/decidim/system/application_mailer.rb b/decidim-system/app/mailers/decidim/system/application_mailer.rb deleted file mode 100644 index f092c080eca3..000000000000 --- a/decidim-system/app/mailers/decidim/system/application_mailer.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module System - # Custom application mailer, scoped to the system mailer. - # - class ApplicationMailer < ActionMailer::Base - default from: email_address_with_name(Decidim.config.mailer_sender, Decidim.config.application_name) - layout "mailer" - end - end -end diff --git a/decidim-system/spec/mailers/decidim/system/application_mailer_spec.rb b/decidim-system/spec/mailers/decidim/system/application_mailer_spec.rb deleted file mode 100644 index f7f60d20d8f0..000000000000 --- a/decidim-system/spec/mailers/decidim/system/application_mailer_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - class DummySystemResourceMailer < Decidim::System::ApplicationMailer - def send_email(user_name, user_email, subject, reply_to) - hash = { to: "#{user_name} <#{user_email}>" } - hash[:subject] = subject if subject - hash[:reply_to] = reply_to if reply_to - - mail( - hash - ) do |format| - format.text { "This is the test" } - format.html { "

This is a mail

" } - end - end - end - - describe DummySystemResourceMailer do - let(:mail) { described_class.send_email(user_name, user_email, mail_subject, reply_to) } - let(:user_name) { "John Doe" } - let(:user_email) { "john.doe@example.org" } - let(:reply_to) { nil } - let(:mail_subject) { "Test subject" } - - context "when sending an email" do - it "returns default values" do - expect(mail.from).to eq(["change-me@example.org"]) - end - - it "returns the application name" do - expect(mail.header[:from].value).to eq("My Application Name ") - end - end - end -end