Download as
Browse Code »

Commit c0f97fc830bacdf4c9de6d8737a339018587726d

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

send_email: fix features tests

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @c0f97fc
@@ -99,9 +99,9 @@ module BoxesHelper @@ -99,9 +99,9 @@ module BoxesHelper
99 unless block.visible? 99 unless block.visible?
100 options[:title] = _("This block is invisible. Your visitors will not see it.") 100 options[:title] = _("This block is invisible. Your visitors will not see it.")
101 end 101 end
102 - if @controller.send(:content_editor?)  
103 - result = filter_html(result, block)  
104 - end 102 +
  103 + result = filter_html(result, block)
  104 +
105 box_decorator.block_target(block.box, block) + 105 box_decorator.block_target(block.box, block) +
106 content_tag('div', 106 content_tag('div',
107 content_tag('div', 107 content_tag('div',
plugins/send_email/features/send_email_plugin.feature
  Diff comments   View file @c0f97fc
@@ -7,7 +7,7 @@ Feature: send_email_plugin @@ -7,7 +7,7 @@ Feature: send_email_plugin
7 And I am logged in as "joaosilva" 7 And I am logged in as "joaosilva"
8 8
9 Scenario: expand macro in article content 9 Scenario: expand macro in article content
10 - Given plugin SendEmailPlugin is enabled on environment 10 + Given plugin SendEmail is enabled on environment
11 And the following articles 11 And the following articles
12 | owner | name | body | 12 | owner | name | body |
13 | joaosilva | sample-article | URL path to {sendemail} action | 13 | joaosilva | sample-article | URL path to {sendemail} action |
@@ -15,7 +15,7 @@ Feature: send_email_plugin @@ -15,7 +15,7 @@ Feature: send_email_plugin
15 Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action" 15 Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action"
16 16
17 Scenario: expand macro in block content 17 Scenario: expand macro in block content
18 - Given plugin SendEmailPlugin is enabled on environment 18 + Given plugin SendEmail is enabled on environment
19 And the following blocks 19 And the following blocks
20 | owner | type | html | 20 | owner | type | html |
21 | joaosilva | RawHTMLBlock | URL path to {sendemail} action | 21 | joaosilva | RawHTMLBlock | URL path to {sendemail} action |