Download as
Browse Code »

Commit 575e39eae9bacb6173f1b0090b6ae99fb8edaf20

Authored by Rodrigo Souto
1 parent b90b8b84
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

[macro-support-review] Fixing send_email plugin

Showing 2 changed files with 6 additions and 7 deletions   Show diff stats
plugins/send_email/lib/send_email_plugin.rb
  Diff comments   View file @575e39e
@@ -12,14 +12,13 @@ class SendEmailPlugin < Noosfero::Plugin @@ -12,14 +12,13 @@ class SendEmailPlugin < Noosfero::Plugin
12 true 12 true
13 end 13 end
14 14
15 - def parse_content(args)  
16 - raw_content = args[:html] 15 + def parse_content(html, source)
17 if context.profile 16 if context.profile
18 - raw_content.gsub(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver") 17 + html.gsub!(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
19 else 18 else
20 - raw_content.gsub(/\{sendemail\}/, '/plugin/send_email/deliver') 19 + html.gsub!(/\{sendemail\}/, '/plugin/send_email/deliver')
21 end 20 end
22 - args.clone.merge({:html => raw_content}) 21 + [html, source]
23 end 22 end
24 23
25 end 24 end
plugins/send_email/test/unit/send_email_plugin_test.rb
  Diff comments   View file @575e39e
@@ -18,12 +18,12 @@ class SendEmailPluginTest < ActiveSupport::TestCase @@ -18,12 +18,12 @@ class SendEmailPluginTest < ActiveSupport::TestCase
18 18
19 should 'expand macro in parse_content event' do 19 should 'expand macro in parse_content event' do
20 @plugin.context.stubs(:profile).returns(nil) 20 @plugin.context.stubs(:profile).returns(nil)
21 - assert_match /plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}") 21 + assert_match /plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}", nil).first
22 end 22 end
23 23
24 should 'expand macro in parse_content event on profile context' do 24 should 'expand macro in parse_content event on profile context' do
25 @plugin.context.stubs(:profile).returns(fast_create(Community)) 25 @plugin.context.stubs(:profile).returns(fast_create(Community))
26 - assert_match /profile\/#{@plugin.context.profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}") 26 + assert_match /profile\/#{@plugin.context.profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}", nil).first
27 end 27 end
28 28
29 end 29 end