From c0f97fc830bacdf4c9de6d8737a339018587726d Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Mon, 7 Oct 2013 10:13:30 -0300 Subject: [PATCH] send_email: fix features tests --- app/helpers/boxes_helper.rb | 6 +++--- plugins/send_email/features/send_email_plugin.feature | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index 4835553..6f08a83 100644 --- a/app/helpers/boxes_helper.rb +++ b/app/helpers/boxes_helper.rb @@ -99,9 +99,9 @@ module BoxesHelper unless block.visible? options[:title] = _("This block is invisible. Your visitors will not see it.") end - if @controller.send(:content_editor?) - result = filter_html(result, block) - end + + result = filter_html(result, block) + box_decorator.block_target(block.box, block) + content_tag('div', content_tag('div', diff --git a/plugins/send_email/features/send_email_plugin.feature b/plugins/send_email/features/send_email_plugin.feature index a0877a3..c40af85 100644 --- a/plugins/send_email/features/send_email_plugin.feature +++ b/plugins/send_email/features/send_email_plugin.feature @@ -7,7 +7,7 @@ Feature: send_email_plugin And I am logged in as "joaosilva" Scenario: expand macro in article content - Given plugin SendEmailPlugin is enabled on environment + Given plugin SendEmail is enabled on environment And the following articles | owner | name | body | | joaosilva | sample-article | URL path to {sendemail} action | @@ -15,7 +15,7 @@ Feature: send_email_plugin Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action" Scenario: expand macro in block content - Given plugin SendEmailPlugin is enabled on environment + Given plugin SendEmail is enabled on environment And the following blocks | owner | type | html | | joaosilva | RawHTMLBlock | URL path to {sendemail} action | -- libgit2 0.21.2