Download as
Browse Code »

Commit 575e39eae9bacb6173f1b0090b6ae99fb8edaf20

Authored by Rodrigo Souto
1 parent b90b8b84
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[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 12 true
13 13 end
14 14  
15   - def parse_content(args)
16   - raw_content = args[:html]
  15 + def parse_content(html, source)
17 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 18 else
20   - raw_content.gsub(/\{sendemail\}/, '/plugin/send_email/deliver')
  19 + html.gsub!(/\{sendemail\}/, '/plugin/send_email/deliver')
21 20 end
22   - args.clone.merge({:html => raw_content})
  21 + [html, source]
23 22 end
24 23  
25 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 18  
19 19 should 'expand macro in parse_content event' do
20 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 22 end
23 23  
24 24 should 'expand macro in parse_content event on profile context' do
25 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 27 end
28 28  
29 29 end
... ...