-
-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c1ce5c5
commit 7466339
Showing
10 changed files
with
76 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <%= render partial: 'user_mailer/mail_template', locals: { | ||
| title: t(:congratulations), | ||
| subtitle: t(:certificate_available), | ||
| text: t(:certificate_download), | ||
| button: t(:my_profile), | ||
| title: t('mailer.title.certificate'), | ||
| subtitle: t('mailer.subtitle.certificate'), | ||
| text: t('mailer.text.certificate'), | ||
| button: t('mailer.button.certificate'), | ||
| url: @organization.url_for('/user/certificates') | ||
| } %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| <%= render partial: 'user_mailer/mail_template', locals: { | ||
| title: t("mailer.title.exam_authorization_request_rejected"), | ||
| subtitle: t("mailer.subtitle.exam_authorization_request_rejected"), | ||
| text: t("mailer.text.exam_authorization_request_rejected"), | ||
| button: t("mailer.button.exam_authorization_request_rejected"), | ||
| url: @organization.url_for('/user/exam_authorizations') | ||
| text: t("mailer.text.exam_authorization_request_rejected") | ||
| } %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <%= render partial: 'user_mailer/mail_template', locals: { | ||
| title: '¡Hola, Matías!<br>Te damos la bienvenida a Mumuki'.html_safe, | ||
| title: t('mailer.title.welcome', first_name: @user.first_name).html_safe, | ||
| text: @organization.welcome_email_template.html_safe, | ||
| url: @organization.url_for('/user'), | ||
| } %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -82,21 +82,21 @@ | |
|
|
||
| context "last submission 1 week ago" do | ||
| it { expect(user.should_remind?).to be true } | ||
| it { expect(reminder.body.encoded).to include("Keep learning") } | ||
| it { expect(reminder.body.encoded).to include 'KEEP LEARNING' } | ||
| end | ||
|
|
||
| context "last submission 2 weeks ago" do | ||
| let(:days_since_last_submission) { 16 } | ||
|
|
||
| it { expect(user.should_remind?).to be true } | ||
| it { expect(reminder.body.encoded).to include("Keep learning") } | ||
| it { expect(reminder.body.encoded).to include 'KEEP LEARNING' } | ||
| end | ||
|
|
||
| context "last submission 3 weeks ago" do | ||
| let(:days_since_last_submission) { 26 } | ||
|
|
||
| it { expect(user.should_remind?).to be true } | ||
| it { expect(reminder.body.encoded).to include("Keep learning") } | ||
| it { expect(reminder.body.encoded).to include 'KEEP LEARNING' } | ||
| end | ||
|
|
||
| context "last submission 4 weeks ago" do | ||
|
|
@@ -186,7 +186,7 @@ | |
|
|
||
| let(:user) { create :user, first_name: 'some name' } | ||
|
|
||
| it { expect(email.body.encoded).to eq 'hello some name!' } | ||
| it { expect(email.body.encoded).to include 'Hello some name!' } | ||
|
|
||
| context 'when organization does not have a custom sender address' do | ||
| it { expect(email.from).to eq ['[email protected]'] } | ||
|
|
||