Contact <%= email_link(additional_info: { subject: "Custom Bulk Pricing/Partnerships" }) %> for custom bulk pricing and partnerships.
+Contact <%= contact_link(additional_info: { subject: "Custom Bulk Pricing/Partnerships" }) %> for custom bulk pricing and partnerships.
- <%= t("views.deep_links.alert.desc_html", email: link_to(ForemInstance.email, href: "mailto:#{ForemInstance.email}")) %> + <%= t("views.deep_links.alert.desc_html", email: link_to(ForemInstance.contact_email, href: "mailto:#{ForemInstance.contact_email}")) %>
Tag moderation is something we're continuously iterating on, so you can expect adjustments and expanding features over time as we receive feedback. We regularly send out a biweekly Mod Newsletter to keep mods up to date on these changes, so look out for it! - Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= email_link %> and share your thoughts. + Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= contact_link %> and share your thoughts.
diff --git a/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb b/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb index cd3c64fa0..9cfa1e97c 100644 --- a/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb +++ b/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb @@ -12,7 +12,7 @@ For details on all available features and how to access them, visit our tag mode Tag moderation is something we're continuously iterating on, so you can expect adjustments and expanding features over time as we receive feedback. We regularly send out a biweekly Mod Newsletter to keep mods up to date on these changes, so look out for it! -Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= ForemInstance.email %> and share your thoughts. +Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= ForemInstance.contact_email %> and share your thoughts. Thanks so much for volunteering your time to benefit <%= community_name %>. We sincerely appreciate your help! diff --git a/app/views/mailers/notify_mailer/trusted_role_email.html.erb b/app/views/mailers/notify_mailer/trusted_role_email.html.erb index a60c5d323..d650f9c6f 100644 --- a/app/views/mailers/notify_mailer/trusted_role_email.html.erb +++ b/app/views/mailers/notify_mailer/trusted_role_email.html.erb @@ -29,7 +29,7 @@ You may occasionally receive notifications about optional moderation actions; please unsubscribe if you do not want to receive these updates.
- If you have any questions or feedback for us, please write to <%= email_link %> and share your thoughts. + If you have any questions or feedback for us, please write to <%= contact_link %> and share your thoughts.
diff --git a/app/views/mailers/notify_mailer/trusted_role_email.text.erb b/app/views/mailers/notify_mailer/trusted_role_email.text.erb index 7d99eeca2..fbb03f373 100644 --- a/app/views/mailers/notify_mailer/trusted_role_email.text.erb +++ b/app/views/mailers/notify_mailer/trusted_role_email.text.erb @@ -20,7 +20,7 @@ For details on all available features and how to access them, visit our <%= comm You may occasionally receive notifications about optional moderation actions; please unsubscribe (<%= app_url(user_settings_path(:notifications)) %>) if you do not want to receive these updates. -If you have any questions or feedback for us, please write to <%= ForemInstance.email %> and share your thoughts. +If you have any questions or feedback for us, please write to <%= ForemInstance.contact_email %> and share your thoughts. Thanks for being such an awesome member of the community! diff --git a/app/views/moderations/_mod_sidebar_left.html.erb b/app/views/moderations/_mod_sidebar_left.html.erb index aee290657..74c2a030c 100644 --- a/app/views/moderations/_mod_sidebar_left.html.erb +++ b/app/views/moderations/_mod_sidebar_left.html.erb @@ -79,7 +79,7 @@ <%= t("views.moderations.aside.feedback.subtitle") %> - <%= t("views.moderations.aside.feedback.description", email: ForemInstance.email) %> + <%= t("views.moderations.aside.feedback.description", email: ForemInstance.contact_email) %> diff --git a/app/views/moderations/index.html.erb b/app/views/moderations/index.html.erb index f9d45e9d3..bd7530969 100644 --- a/app/views/moderations/index.html.erb +++ b/app/views/moderations/index.html.erb @@ -38,7 +38,7 @@ <%= t("views.moderations.notice.desc2_html", code: link_to(t("views.moderations.notice.code_of_conduct"), code_of_conduct_path), trusted: link_to(t("views.moderations.notice.trusted"), community_moderation_path), tag: link_to(t("views.moderations.notice.tag"), tag_moderation_path)) %>
-<%= t("views.moderations.notice.desc3_html", email: mail_to(email_link, email_link)) %>
+<%= t("views.moderations.notice.desc3_html", email: mail_to(contact_link, contact_link)) %>
<% unless user_signed_in? %><%= t("views.moderations.notice.desc4") %>
<% end %> diff --git a/app/views/open_search/show.xml.erb b/app/views/open_search/show.xml.erb index 4ee8f613c..2986b8cac 100644 --- a/app/views/open_search/show.xml.erb +++ b/app/views/open_search/show.xml.erb @@ -3,6 +3,6 @@Violations of the Code of Conduct may be reported by contacting the team via the <% if creator_settings_form? %> - abuse report form or by sending an email to <%= email_link %>. All reports will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Further details of specific enforcement policies may be posted separately. + abuse report form or by sending an email to <%= contact_link %>. All reports will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Further details of specific enforcement policies may be posted separately. <% else %> - ">abuse report form or by sending an email to <%= email_link %>. All reports will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Further details of specific enforcement policies may be posted separately. + ">abuse report form or by sending an email to <%= contact_link %>. All reports will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Further details of specific enforcement policies may be posted separately. <% end %>
Moderators have the right and responsibility to remove comments or other contributions that are not aligned to this Code of Conduct, or to suspend temporarily or permanently any members for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
diff --git a/app/views/pages/_privacy_text.html.erb b/app/views/pages/_privacy_text.html.erb index ad9773afe..b3d66feab 100644 --- a/app/views/pages/_privacy_text.html.erb +++ b/app/views/pages/_privacy_text.html.erb @@ -132,14 +132,14 @@Deleting Your Personal Information
- You may request deletion of your personal information and account by emailing <%= email_link %>.
+ You may request deletion of your personal information and account by emailing <%= contact_link %>.
To protect information from accidental or malicious destruction, we may maintain residual copies for a brief time period. But, if you delete your account, your information and content will be unrecoverable after that time.
Data Portability
- If you would like to request a copy of your user data, please email <%= email_link %>.
Business Transfers
If we are involved in a merger, acquisition, bankruptcy, reorganization or sale of assets such that your information would be transferred or become subject to a different privacy policy, we’ll notify you in advance of any such change.
@@ -150,4 +150,4 @@
Questions
- We welcome feedback about this policy at <%= email_link %>.
Users agree and certify that they have rights to share all content that they post on dev.to — including, but not limited to, information posted in articles, discussions, and comments. This rule applies to prose, code snippets, collections of links, etc. Regardless of citation, users may not post copy and pasted content that does not belong to them. Users assume all risk for the content they post, including someone else's reliance on its accuracy, claims relating to intellectual property, or other legal rights. If you believe that a user has plagiarized content, misrepresented their identity, misappropriated work, or otherwise run afoul of DMCA regulations, please email - <%= email_link %>. <%= community_name %> may remove any content users post for any reason. + <%= contact_link %>. <%= community_name %> may remove any content users post for any reason.
All uses of the <%= community_name %> logo, <%= community_name %> badges, brand slogans, iconography, and the like, may only be used with express permission from <%= community_name %>. - <%= community_name %> reserves all rights, even if certain assets are included in <%= community_name %> open source projects. Please contact <%= email_link %> with any questions or to request permission. + <%= community_name %> reserves all rights, even if certain assets are included in <%= community_name %> open source projects. Please contact <%= contact_link %> with any questions or to request permission.
- Email: <%= email_link %> 😁 + Email: <%= contact_link %> 😁
Twitter: ">@<%= Settings::General.social_media_handles["twitter"] %> 👻 diff --git a/app/views/pages/forbidden.html.erb b/app/views/pages/forbidden.html.erb index 0edaee4e7..5a13c529c 100644 --- a/app/views/pages/forbidden.html.erb +++ b/app/views/pages/forbidden.html.erb @@ -5,4 +5,4 @@ Your ability to post and comment may be limited.
-For more information, you may send a message to <%= ForemInstance.email %>.
+For more information, you may send a message to <%= contact_link %>.
diff --git a/app/views/users/_org_admin.html.erb b/app/views/users/_org_admin.html.erb index 31902394f..652c8a310 100644 --- a/app/views/users/_org_admin.html.erb +++ b/app/views/users/_org_admin.html.erb @@ -220,7 +220,7 @@ <% end %>- <%= t("views.settings.org.admin.delete.questions_html", email: link_to(ForemInstance.email, ForemInstance.email)) %> + <%= t("views.settings.org.admin.delete.questions_html", email: link_to(ForemInstance.contact_email, ForemInstance.contact_email)) %>
diff --git a/app/views/users/confirm_destroy.html.erb b/app/views/users/confirm_destroy.html.erb index 4ff7c7268..191b53eab 100644 --- a/app/views/users/confirm_destroy.html.erb +++ b/app/views/users/confirm_destroy.html.erb @@ -42,7 +42,7 @@ deleteAccountVerificationInput.addEventListener('input', disableDeleteAccountBtn);- <%= t("views.settings.destroy.ghost_html", ghost: link_to("@ghost", "/ghost"), click: email_link(text: t("views.settings.destroy.click"), additional_info: { subject: "Request Account Deletion", body: @email_body })) %> + <%= t("views.settings.destroy.ghost_html", ghost: link_to("@ghost", "/ghost"), click: contact_link(text: t("views.settings.destroy.click"), additional_info: { subject: "Request Account Deletion", body: @email_body })) %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index ccfe77c58..bb7ae929b 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -15,7 +15,7 @@ <% if params[:state] == "previous-registration" %>
<% end %> diff --git a/cypress/integration/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js b/cypress/integration/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js index ad99f6943..5f8ae18e8 100644 --- a/cypress/integration/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js +++ b/cypress/integration/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js @@ -1,39 +1,46 @@ -describe('Email digest frequency Section', () => { +describe('Emails Section', () => { beforeEach(() => { cy.testSetup(); cy.fixture('users/adminUser.json').as('user'); cy.get('@user').then((user) => { - cy.loginUser(user); + cy.loginAndVisit(user, '/admin/customization/config'); + }); + }); + + describe('contact settings', () => { + it('can update the contact email', () => { + cy.findByTestId('emailForm').as('emailForm'); + + cy.get('@emailForm').within(() => { + cy.findByText('Emails').click(); + cy.findByLabelText('Contact email').clear().type('yo@dev.to'); + cy.findByText('Update Settings').click(); + }); + + cy.url().should('contains', '/admin/customization/config'); + + cy.findByText('Successfully updated settings.').should('be.visible'); + + cy.findByLabelText('Contact email').should('have.value', 'yo@dev.to'); }); }); describe('email digest frequency settings', () => { it('can change the frequency', () => { - cy.get('@user').then(() => { - cy.visit('/admin/customization/config'); - cy.findByTestId('emailDigestSectionForm').as('emailDigestSectionForm'); + cy.findByTestId('emailForm').as('emailForm'); - cy.get('@emailDigestSectionForm') - .findByText('Email digest frequency') - .click(); - - cy.get('@emailDigestSectionForm') - .get('#settings_general_periodic_email_digest') - .clear() - .type('42'); - - cy.get('@emailDigestSectionForm').findByText('Update Settings').click(); - - cy.url().should('contains', '/admin/customization/config'); - - cy.findByText('Successfully updated settings.').should('be.visible'); - - cy.get('#settings_general_periodic_email_digest').should( - 'have.value', - '42', - ); + cy.get('@emailForm').within(() => { + cy.findByText('Emails').click(); + cy.findByLabelText('Periodic email digest').clear().type('42'); + cy.findByText('Update Settings').click(); }); + + cy.url().should('contains', '/admin/customization/config'); + + cy.findByText('Successfully updated settings.').should('be.visible'); + + cy.findByLabelText('Periodic email digest').should('have.value', '42'); }); }); }); diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index d0264c718..51da43c5e 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -238,24 +238,24 @@ RSpec.describe ApplicationHelper, type: :helper do end end - describe "#email_link" do + describe "#contact_link" do let(:default_email) { "hi@dev.to" } before do - allow(ForemInstance).to receive(:email).and_return(default_email) + allow(ForemInstance).to receive(:contact_email).and_return(default_email) end it "returns an 'a' tag" do - expect(helper.email_link).to have_selector("a") + expect(helper.contact_link).to have_selector("a") end it "sets the correct href" do - expect(helper.email_link).to have_link(href: "mailto:#{default_email}") + expect(helper.contact_link).to have_link(href: "mailto:#{default_email}") end it "has the correct text in the a tag" do - expect(helper.email_link(text: "Link Name")).to have_text("Link Name") - expect(helper.email_link).to have_text(default_email) + expect(helper.contact_link(text: "Link Name")).to have_text("Link Name") + expect(helper.contact_link).to have_text(default_email) end it "returns an href with additional_info parameters" do @@ -266,7 +266,7 @@ RSpec.describe ApplicationHelper, type: :helper do link = "text" - expect(email_link(text: "text", additional_info: additional_info)).to eq(link) + expect(contact_link(text: "text", additional_info: additional_info)).to eq(link) end end diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb index 449510e21..dbb9fa5ca 100644 --- a/spec/models/article_spec.rb +++ b/spec/models/article_spec.rb @@ -1404,7 +1404,7 @@ RSpec.describe Article, type: :model do create(:article, body_markdown: body_markdown, feed_source_url: url) another_article = build(:article, body_markdown: body_markdown, feed_source_url: url) error_message = "has already been taken. " \ - "Email #{ForemInstance.email} for further details." + "Email #{ForemInstance.contact_email} for further details." expect(another_article).not_to be_valid expect(another_article.errors.messages[:canonical_url]).to include(error_message) expect(another_article.errors.messages[:feed_source_url]).to include(error_message) diff --git a/spec/models/forem_instance_spec.rb b/spec/models/forem_instance_spec.rb index b8f3a4b74..c368a497e 100644 --- a/spec/models/forem_instance_spec.rb +++ b/spec/models/forem_instance_spec.rb @@ -96,4 +96,16 @@ RSpec.describe ForemInstance, type: :model do ENV["SENDGRID_API_KEY"] = nil end end + + describe ".contact_email" do + let(:email) { "contact@dev.to" } + + before do + allow(Settings::General).to receive(:contact_email).and_return(email) + end + + it "sets the correct email" do + expect(described_class.contact_email).to be(email) + end + end end diff --git a/spec/requests/user/user_settings_spec.rb b/spec/requests/user/user_settings_spec.rb index d22543853..e4d765d4e 100644 --- a/spec/requests/user/user_settings_spec.rb +++ b/spec/requests/user/user_settings_spec.rb @@ -388,7 +388,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: #{ForemInstance.email}" + "An error occurred. Please try again or send an email to: #{ForemInstance.contact_email}" expect(flash[:error]).to eq(error) end @@ -431,7 +431,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: #{ForemInstance.email}" + "An error occurred. Please try again or send an email to: #{ForemInstance.contact_email}" expect(flash[:error]).to eq(error) end diff --git a/spec/system/authentication/user_request_confirmation_spec.rb b/spec/system/authentication/user_request_confirmation_spec.rb index eb82c2409..5bb7442a3 100644 --- a/spec/system/authentication/user_request_confirmation_spec.rb +++ b/spec/system/authentication/user_request_confirmation_spec.rb @@ -7,7 +7,7 @@ RSpec.describe "/confirm-email", type: :system do click_button "Resend" expect(page).to have_current_path(user_confirmation_path) - expected_message = I18n.t("confirmations_controller.email_sent", email: ForemInstance.email) + expected_message = I18n.t("confirmations_controller.email_sent", email: ForemInstance.contact_email) expect(page).to have_content(expected_message) end end