Download as
Browse Code »

Commit bd55ad6081281be89bcdc90136c341fe89dce0f6

Authored by Victor Costa
1 parent c5265b67
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Set the asset host for person notifier mailing

Showing 2 changed files with 14 additions and 0 deletions   Show diff stats
app/models/person_notifier.rb
  Diff comments   View file @bd55ad6
... ... @@ -74,6 +74,11 @@ class PersonNotifier
74 74 end
75 75  
76 76 def content_summary(person, notifications)
  77 + if person.environment
  78 + ActionMailer::Base.asset_host = person.environment.top_url
  79 + ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname
  80 + end
  81 +
77 82 @current_theme = 'default'
78 83 @profile = person
79 84 @recipient = @profile.nickname || @profile.name
... ...
test/unit/person_notifier_test.rb
  Diff comments   View file @bd55ad6
... ... @@ -225,6 +225,15 @@ class PersonNotifierTest < ActiveSupport::TestCase
225 225 assert !jobs.select {|j| !j.failed? && j.last_error.nil? }.empty?
226 226 end
227 227  
  228 + should 'render image tags for both internal and external src' do
  229 + @community.add_member(@member)
  230 + process_delayed_job_queue
  231 + notify
  232 + sent = ActionMailer::Base.deliveries.last
  233 + assert_match /src="\/\/www.gravatar.com\/avatar.*"/, sent.body.to_s
  234 + assert_match /src="http:\/\/.*\/images\/icons-app\/community-icon.png.*"/, sent.body.to_s
  235 + end
  236 +
228 237 private
229 238  
230 239 def notify
... ...