github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 02:35:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Re-enable invalid interpolation keys check and allow default keys to be left out of translation overrides.

Browse Source 
https://meta.discourse.org/t/bulk-invite-from-file-resets-the-invite-forum-mailer-customized-text/67606/16
This commit is contained in:
Guo Xiang Tan
2017-11-20 16:10:06 +08:00
parent 2e04ef97d9
commit 5805979e88
6 changed files with 83 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spec/requests/admin/email_templates_controller_spec.rb
View File

@ -113,27 +113,52 @@ RSpec.describe Admin::EmailTemplatesController do
end
context "when subject is invalid" do
let(:email_subject) { 'Subject with missing interpolation key' }
let(:email_body) { 'The body contains [%{site_name}](%{base_url}) and %{email_token}.' }
let(:expected_errors) { ['<b>Subject</b>: The following interpolation key(s) are missing: "email_prefix"'] }
let(:email_subject) { '%{email_wrongfix} Foo' }
let(:email_body) { 'Body with missing interpolation keys' }
let(:expected_errors) do
[
"<b>Subject</b>: #{I18n.t(
'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
keys: 'email_wrongfix'
)}"
]
end
include_examples "invalid email template"
end
context "when body is invalid" do
let(:email_subject) { '%{email_prefix} Foo' }
let(:email_body) { 'Body with some missing interpolation keys: %{email_token}' }
let(:expected_errors) { ['<b>Body</b>: The following interpolation key(s) are missing: "site_name, base_url"'] }
let(:email_subject) { 'Subject with missing interpolation key' }
let(:email_body) { 'Body with %{invalid} interpolation key' }
let(:expected_errors) do
[
"<b>Body</b>: #{I18n.t(
'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
keys: 'invalid'
)}"
]
end
include_examples "invalid email template"
end
context "when subject and body are invalid invalid" do
let(:email_subject) { 'Subject with missing interpolation key' }
let(:email_body) { 'Body with some missing interpolation keys: %{email_token}' }
let(:email_subject) { 'Subject with %{invalid} interpolation key' }
let(:email_body) { 'Body with some invalid interpolation keys: %{invalid}' }
let(:expected_errors) do
['<b>Subject</b>: The following interpolation key(s) are missing: "email_prefix"',
'<b>Body</b>: The following interpolation key(s) are missing: "site_name, base_url"']
[
"<b>Subject</b>: #{I18n.t(
'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
keys: 'invalid'
)}",
"<b>Body</b>: #{I18n.t(
'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
keys: 'invalid'
)}",
]
end
include_examples "invalid email template"