Commit 0058f46f8bc909023f0cb3e9028b8c5d561639d9
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'fix_person_notifier' into stable
Conflicts: app/models/person_notifier.rb test/unit/person_notifier_test.rb
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/models/person_notifier.rb
| @@ -84,7 +84,7 @@ class PersonNotifier | @@ -84,7 +84,7 @@ class PersonNotifier | ||
| 84 | 84 | ||
| 85 | def content_summary(person, notifications, tasks) | 85 | def content_summary(person, notifications, tasks) |
| 86 | if person.environment | 86 | if person.environment |
| 87 | - ActionMailer::Base.asset_host = person.environment.default_hostname | 87 | + ActionMailer::Base.asset_host = person.environment.top_url |
| 88 | ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname | 88 | ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname |
| 89 | end | 89 | end |
| 90 | 90 |
test/unit/person_notifier_test.rb
| @@ -243,7 +243,7 @@ class PersonNotifierTest < ActiveSupport::TestCase | @@ -243,7 +243,7 @@ class PersonNotifierTest < ActiveSupport::TestCase | ||
| 243 | notify | 243 | notify |
| 244 | sent = ActionMailer::Base.deliveries.last | 244 | sent = ActionMailer::Base.deliveries.last |
| 245 | assert_match /src="\/\/www.gravatar.com\/avatar.*"/, sent.body.to_s | 245 | assert_match /src="\/\/www.gravatar.com\/avatar.*"/, sent.body.to_s |
| 246 | - assert_match /src="\/\/localhost\/images\/icons-app\/community-icon.png.*"/, sent.body.to_s | 246 | + assert_match /src="http:\/\/localhost\/images\/icons-app\/community-icon.png.*"/, sent.body.to_s |
| 247 | end | 247 | end |
| 248 | 248 | ||
| 249 | should 'list tasks in notification mail' do | 249 | should 'list tasks in notification mail' do |