Download as
Browse Code »

Commit 3829248f22e2b4b7a54a3349a9c39f5abf63856b

Authored by Daniela Feitosa
1 parent 3a110cba
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Fixed test 

(ActionItem2748)
Showing 2 changed files with 16 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @3829248
@@ -1424,7 +1424,7 @@ module ApplicationHelper @@ -1424,7 +1424,7 @@ module ApplicationHelper
1424 end 1424 end
1425 1425
1426 def filter_html(html, source) 1426 def filter_html(html, source)
1427 - if @plugins && source.has_macro? 1427 + if @plugins && source && source.has_macro?
1428 html = convert_macro(html, source) unless @plugins.enabled_macros.blank? 1428 html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1429 #TODO This parse should be done through the macro infra, but since there 1429 #TODO This parse should be done through the macro infra, but since there
1430 # are old things that do not support it we are keeping this hot spot. 1430 # are old things that do not support it we are keeping this hot spot.
test/unit/application_helper_test.rb
  Diff comments   View file @3829248
@@ -814,7 +814,7 @@ class ApplicationHelperTest < ActiveSupport::TestCase @@ -814,7 +814,7 @@ class ApplicationHelperTest < ActiveSupport::TestCase
814 assert_no_match /Test1/, parsed_html 814 assert_no_match /Test1/, parsed_html
815 end 815 end
816 816
817 - should 'not convert macro if there is no macro plugin active' do 817 + should 'not convert macro if source is nil' do
818 profile = create_user('testuser').person 818 profile = create_user('testuser').person
819 article = fast_create(Article, :profile_id => profile.id) 819 article = fast_create(Article, :profile_id => profile.id)
820 class Plugin1 < Noosfero::Plugin; end 820 class Plugin1 < Noosfero::Plugin; end
@@ -822,11 +822,24 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase @@ -822,11 +822,24 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
822 environment = Environment.default 822 environment = Environment.default
823 environment.enable_plugin(Plugin1) 823 environment.enable_plugin(Plugin1)
824 @plugins = Noosfero::Plugin::Manager.new(environment, self) 824 @plugins = Noosfero::Plugin::Manager.new(environment, self)
825 - 825 +
826 expects(:convert_macro).never 826 expects(:convert_macro).never
827 filter_html(article.body, nil) 827 filter_html(article.body, nil)
828 end 828 end
829 829
  830 + should 'not convert macro if there is no macro plugin active' do
  831 + profile = create_user('testuser').person
  832 + article = fast_create(Article, :profile_id => profile.id)
  833 + class Plugin1 < Noosfero::Plugin; end
  834 +
  835 + environment = Environment.default
  836 + environment.enable_plugin(Plugin1)
  837 + @plugins = Noosfero::Plugin::Manager.new(environment, self)
  838 +
  839 + expects(:convert_macro).never
  840 + filter_html(article.body, article)
  841 + end
  842 +
830 protected 843 protected
831 include NoosferoTestHelper 844 include NoosferoTestHelper
832 845