Exporting the data to your admin account will send it to your contact - admin email (<%= Settings::General.email_addresses[:default] %>), + admin email (<%= ForemInstance.email %>), and exporting to the user will send it to their email (<%= @user.email %>).
- Make sure it's installed and try again. If the problem persists contact <%= Settings::General.email_addresses[:contact] %> + Make sure it's installed and try again. If the problem persists contact <%= ForemInstance.email %>
Questions? Email us at - <%= Settings::General.email_addresses[:default] %> + <%= ForemInstance.email %> for help.
diff --git a/lib/data_update_scripts/20210509105151_remove_unused_site_config_emails.rb b/lib/data_update_scripts/20210509105151_remove_unused_site_config_emails.rb deleted file mode 100644 index 95044e520..000000000 --- a/lib/data_update_scripts/20210509105151_remove_unused_site_config_emails.rb +++ /dev/null @@ -1,9 +0,0 @@ -module DataUpdateScripts - class RemoveUnusedSiteConfigEmails - def run - Settings::General.email_addresses = { - default: ApplicationConfig["DEFAULT_EMAIL"] - } - end - end -end diff --git a/lib/data_update_scripts/20210604104735_remove_email_addresses_scripts.rb b/lib/data_update_scripts/20210604104735_remove_email_addresses_scripts.rb new file mode 100644 index 000000000..b3c9196c3 --- /dev/null +++ b/lib/data_update_scripts/20210604104735_remove_email_addresses_scripts.rb @@ -0,0 +1,8 @@ +module DataUpdateScripts + class RemoveEmailAddressesScripts + def run + DataUpdateScript.delete_by(file_name: "20210509105151_remove_unused_site_config_emails") + Settings::General.delete_by(var: :email_addresses) + end + end +end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 3380e15cf..36803c4d0 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -161,11 +161,7 @@ RSpec.describe ApplicationHelper, type: :helper do let(:default_email) { "hi@dev.to" } before do - allow(Settings::General).to receive(:email_addresses).and_return( - { - default: default_email - }, - ) + allow(ForemInstance).to receive(:email).and_return(default_email) end it "returns an 'a' tag" do diff --git a/spec/lib/data_update_scripts/remove_unused_site_config_emails_spec.rb b/spec/lib/data_update_scripts/remove_unused_site_config_emails_spec.rb deleted file mode 100644 index dbfdbcb78..000000000 --- a/spec/lib/data_update_scripts/remove_unused_site_config_emails_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require "rails_helper" -require Rails.root.join( - "lib/data_update_scripts/20210509105151_remove_unused_site_config_emails.rb", -) - -describe DataUpdateScripts::RemoveUnusedSiteConfigEmails do - let(:contact_email) { "contact@dev.to" } - - before do - Settings::General.email_addresses = { - default: ApplicationConfig["DEFAULT_EMAIL"], - contact: "contact@dev.to", - business: "business@dev.to", - privacy: "privacy@dev.to", - members: "members@dev.to" - } - end - - it "removes the unused emails" do - described_class.new.run - expect(Settings::General.email_addresses.symbolize_keys).to eq(default: ApplicationConfig["DEFAULT_EMAIL"]) - end -end diff --git a/spec/mailers/devise_mailer_spec.rb b/spec/mailers/devise_mailer_spec.rb index a429d80bc..dc5d64fb4 100644 --- a/spec/mailers/devise_mailer_spec.rb +++ b/spec/mailers/devise_mailer_spec.rb @@ -11,7 +11,7 @@ RSpec.describe DeviseMailer, type: :mailer do end it "renders sender" do - expected_from = "#{Settings::Community.community_name} <#{Settings::General.email_addresses[:default]}>" + expected_from = "#{Settings::Community.community_name} <#{ForemInstance.email}>" expect(email["from"].value).to eq(expected_from) end diff --git a/spec/mailers/digest_mailer_spec.rb b/spec/mailers/digest_mailer_spec.rb index 8a2f23b6c..ba2173cd6 100644 --- a/spec/mailers/digest_mailer_spec.rb +++ b/spec/mailers/digest_mailer_spec.rb @@ -14,8 +14,8 @@ RSpec.describe DigestMailer, type: :mailer do expect(email.subject).not_to be_nil expect(email.to).to eq([user.email]) - expect(email.from).to eq([Settings::General.email_addresses[:default]]) - expected_from = "#{Settings::Community.community_name} Digest <#{Settings::General.email_addresses[:default]}>" + expect(email.from).to eq([ForemInstance.email]) + expected_from = "#{Settings::Community.community_name} Digest <#{ForemInstance.email}>" expect(email["from"].value).to eq(expected_from) end end diff --git a/spec/mailers/notify_mailer_spec.rb b/spec/mailers/notify_mailer_spec.rb index c1fd13ea6..5ca4f4545 100644 --- a/spec/mailers/notify_mailer_spec.rb +++ b/spec/mailers/notify_mailer_spec.rb @@ -432,17 +432,17 @@ RSpec.describe NotifyMailer, type: :mailer do end it "renders proper sender" do - expected_from = "#{Settings::Community.community_name} <#{Settings::General.email_addresses[:default]}>" + expected_from = "#{Settings::Community.community_name} <#{ForemInstance.email}>" - expect(moderator_email.from).to eq([Settings::General.email_addresses[:default]]) + expect(moderator_email.from).to eq([ForemInstance.email]) expect(moderator_email["from"].value).to eq(expected_from) - expect(member_email.from).to eq([Settings::General.email_addresses[:default]]) + expect(member_email.from).to eq([ForemInstance.email]) expect(member_email["from"].value).to eq(expected_from) end it "renders proper reply_to" do - expect(moderator_email["reply_to"].value).to eq(Settings::General.email_addresses[:default]) + expect(moderator_email["reply_to"].value).to eq(ForemInstance.email) end it "renders proper receiver" do diff --git a/spec/mailers/shared_examples/renders_proper_email_headers.rb b/spec/mailers/shared_examples/renders_proper_email_headers.rb index 45e9f728b..5fe49296d 100644 --- a/spec/mailers/shared_examples/renders_proper_email_headers.rb +++ b/spec/mailers/shared_examples/renders_proper_email_headers.rb @@ -1,11 +1,11 @@ RSpec.shared_examples "#renders_proper_email_headers" do it "renders proper sender" do - expect(email.from).to eq([Settings::General.email_addresses[:default]]) - expected_from = "#{Settings::Community.community_name} <#{Settings::General.email_addresses[:default]}>" + expect(email.from).to eq([ForemInstance.email]) + expected_from = "#{Settings::Community.community_name} <#{ForemInstance.email}>" expect(email["from"].value).to eq(expected_from) end it "renders proper reply_to" do - expect(email["reply_to"].value).to eq(Settings::General.email_addresses[:default]) + expect(email["reply_to"].value).to eq(ForemInstance.email) end end diff --git a/spec/mailers/verification_mailer_spec.rb b/spec/mailers/verification_mailer_spec.rb index 9cf883788..0960bacd9 100644 --- a/spec/mailers/verification_mailer_spec.rb +++ b/spec/mailers/verification_mailer_spec.rb @@ -9,8 +9,8 @@ RSpec.describe VerificationMailer, type: :mailer do expect(email.subject).not_to be_nil expect(email.to).to eq([user.email]) - expect(email.from).to eq([Settings::General.email_addresses[:default]]) - from = "#{Settings::Community.community_name} Email Verification <#{Settings::General.email_addresses[:default]}>" + expect(email.from).to eq([ForemInstance.email]) + from = "#{Settings::Community.community_name} Email Verification <#{ForemInstance.email}>" expect(email["from"].value).to eq(from) end end diff --git a/spec/requests/admin/configs_spec.rb b/spec/requests/admin/configs_spec.rb index 079ef9d4f..bbe8425b6 100644 --- a/spec/requests/admin/configs_spec.rb +++ b/spec/requests/admin/configs_spec.rb @@ -289,7 +289,7 @@ RSpec.describe "/admin/customization/config", type: :request do confirmation: confirmation_message } - expect(Settings::General.email_addresses[:default]).not_to eq("random@example.com") + expect(ForemInstance.email).not_to eq("random@example.com") end end diff --git a/spec/requests/user/user_settings_spec.rb b/spec/requests/user/user_settings_spec.rb index 6b30d9d9e..6dc442999 100644 --- a/spec/requests/user/user_settings_spec.rb +++ b/spec/requests/user/user_settings_spec.rb @@ -401,7 +401,7 @@ RSpec.describe "UserSettings", type: :request do expect(response).to redirect_to("/settings/account") error = - "An error occurred. Please try again or send an email to: #{Settings::General.email_addresses[:default]}" + "An error occurred. Please try again or send an email to: #{ForemInstance.email}" expect(flash[:error]).to eq(error) end @@ -444,7 +444,7 @@ RSpec.describe "UserSettings", type: :request do delete users_remove_identity_path, params: { provider: provider } error = - "An error occurred. Please try again or send an email to: #{Settings::General.email_addresses[:default]}" + "An error occurred. Please try again or send an email to: #{ForemInstance.email}" expect(flash[:error]).to eq(error) end diff --git a/spec/services/exporter/service_spec.rb b/spec/services/exporter/service_spec.rb index e182d6471..7a08e5f46 100644 --- a/spec/services/exporter/service_spec.rb +++ b/spec/services/exporter/service_spec.rb @@ -94,7 +94,7 @@ RSpec.describe Exporter::Service, type: :service do context "when emailing an admin" do it "delivers one email to the contact admin email" do admin_email = "admin@example.com" - allow(Settings::General).to receive(:email_addresses).and_return({ contact: admin_email }) + allow(ForemInstance).to receive(:email).and_return(admin_email) service = valid_instance(article.user) service.export(admin_email) expect(ActionMailer::Base.deliveries.last.to.first).to eq admin_email diff --git a/spec/system/authentication/user_request_confirmation_spec.rb b/spec/system/authentication/user_request_confirmation_spec.rb index c306a6f2c..1d0d227ed 100644 --- a/spec/system/authentication/user_request_confirmation_spec.rb +++ b/spec/system/authentication/user_request_confirmation_spec.rb @@ -8,7 +8,7 @@ RSpec.describe "/confirm-email", type: :system do expect(page).to have_current_path(user_confirmation_path) expected_message = format(ConfirmationsController::FLASH_MESSAGE, - email: Settings::General.email_addresses[:default]) + email: ForemInstance.email) expect(page).to have_content(expected_message) end end