Download as
Browse Code »

Commit 0058f46f8bc909023f0cb3e9028b8c5d561639d9

Authored by Victor Costa
2 parents 78e7b747 179d7702
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

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
  Diff comments   View file @0058f46
... ... @@ -84,7 +84,7 @@ class PersonNotifier
84 84  
85 85 def content_summary(person, notifications, tasks)
86 86 if person.environment
87   - ActionMailer::Base.asset_host = person.environment.default_hostname
  87 + ActionMailer::Base.asset_host = person.environment.top_url
88 88 ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname
89 89 end
90 90  
... ...
test/unit/person_notifier_test.rb
  Diff comments   View file @0058f46
... ... @@ -243,7 +243,7 @@ class PersonNotifierTest < ActiveSupport::TestCase
243 243 notify
244 244 sent = ActionMailer::Base.deliveries.last
245 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 247 end
248 248  
249 249 should 'list tasks in notification mail' do
... ...