Fixed test

(ActionItem2748)

Fixed test
(ActionItem2748)
Daniela Feitosa
1 parent 3a110cba
Showing 2 changed files with 16 additions and 3 deletions Show diff stats
app/helpers/application_helper.rb
test/unit/application_helper_test.rb
@@ -1424,7 +1424,7 @@ module ApplicationHelper
   end
   def filter_html(html, source)
-    if @plugins && source.has_macro?
+    if @plugins && source && source.has_macro?
       html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
       #TODO This parse should be done through the macro infra, but since there
       #     are old things that do not support it we are keeping this hot spot.
@@ -814,7 +814,7 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_no_match /Test1/, parsed_html
   end
-  should 'not convert macro if there is no macro plugin active' do
+  should 'not convert macro if source is nil' do
     profile = create_user('testuser').person
     article = fast_create(Article,  :profile_id => profile.id)
     class Plugin1 < Noosfero::Plugin; end
@@ -822,11 +822,24 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(Plugin1)
     @plugins = Noosfero::Plugin::Manager.new(environment, self)
- 
+
     expects(:convert_macro).never
     filter_html(article.body, nil)
   end
+  should 'not convert macro if there is no macro plugin active' do
+    profile = create_user('testuser').person
+    article = fast_create(Article,  :profile_id => profile.id)
+    class Plugin1 < Noosfero::Plugin; end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
+
+    expects(:convert_macro).never
+    filter_html(article.body, article)
+  end
+
   protected
   include NoosferoTestHelper
	@@ -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.