fixing unit tests and put article[parent_id] parameter as an option

Leandro Santos
1 parent 8c783480
Showing 4 changed files with 32 additions and 7 deletions Show diff stats
lib/proposals_discussion_plugin.rb
test/unit/discussion_test.rb
test/unit/proposals_discussion_plugin_test.rb
views/cms/proposals_discussion_plugin/_proposal.html.erb
@@ -15,7 +15,7 @@ class ProposalsDiscussionPlugin &lt; Noosfero::Plugin
   def content_types
     if context.respond_to?(:params) && context.params.kind_of?(Hash) && context.params[:controller] == 'cms' && context.params[:action] == 'new'
       types = []
-      parent_id = context.params[:parent_id]
+      parent_id = context.params[:parent_id] || (context.params[:article][:parent_id] unless context.params[:article].nil?)
       parent = parent_id ? context.profile.articles.find(parent_id) : nil
       types << ProposalsDiscussionPlugin::Discussion
       types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
@@ -36,8 +36,8 @@ class DiscussionTest &lt; ActiveSupport::TestCase
     topic4.add_category c2
     random_topics = discussion.random_topics_one_by_category
-    
-    random_topics_categories = random_topics.map {|t| t.category.name }
+
+    random_topics_categories = random_topics.map {|t| t.categories.map{|c|c.name}}.flatten
     assert_equal ["Category 1", "Category 2"],random_topics_categories
   end
@@ -20,26 +20,49 @@ class ProposalsDiscussionPluginTest &lt; ActiveSupport::TestCase
     assert_includes plugin.content_types, ProposalsDiscussionPlugin::Discussion
   end
-  should 'return Topic as a content type if parent is a Discussion' do
+  should 'return Topic as a content type if parent_id parameter is a Discussion' do
     parent = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
     @params[:parent_id] = parent.id
     assert_includes plugin.content_types, ProposalsDiscussionPlugin::Topic
   end
-  should 'return Proposal as a content type if parent is a Topic' do
+  should 'return Topic as a content type if article parent_id is a Discussion' do
+    parent = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    @params[:article] = {}
+    @params[:article][:parent_id] = parent.id
+    assert_includes plugin.content_types, ProposalsDiscussionPlugin::Topic
+  end
+
+  should 'return Proposal as a content type if parent_id parameter is a Topic' do
     parent = fast_create(ProposalsDiscussionPlugin::Topic, :profile_id => @profile.id)
     @params[:parent_id] = parent.id
     assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
   end
-  should 'return Proposal as a content type if parent is a Discussion and allow_topic is false' do
+  should 'return Proposal as a content type if article parent is a Topic' do
+    parent = fast_create(ProposalsDiscussionPlugin::Topic, :profile_id => @profile.id)
+    @params[:article] = {}
+    @params[:article][:parent_id] = parent.id
+    assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
+  end
+
+  should 'return Proposal as a content type if parent_id parameter is a Discussion and allow_topic is false' do
     parent = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :name => 'discussion', :allow_topics => false)
     @params[:parent_id] = parent.id
     assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
   end
-  should 'do not return Proposal as a content type if parent is nil' do
+  should 'return Proposal as a content type if article parent is a Discussion and allow_topic is false' do
+    parent = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :name => 'discussion', :allow_topics => false)
+    @params[:article] = {}
+    @params[:article][:parent_id] = parent.id
+    assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
+  end
+
+  should 'do not return Proposal as a content type if parent and article parent is nil' do
     @params[:parent_id] = nil
+    @params[:article] = {}
+    @params[:article][:parent_id] = nil
     assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
   end
@@ -23,6 +23,8 @@
     <% editor_type = 'mceEditor' %>
     <%= labelled_form_field(strip_tags(@article.discussion.custom_body_label), text_area(:article, :body, :class => editor_type)) %>
   </div>
+
+  <%= hidden_field(:article, :parent_id) %>
 </div>
 <script>
	@@ -15,7 +15,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin		@@ -15,7 +15,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin
15	def content_types	15	def content_types
16	if context.respond_to?(:params) && context.params.kind_of?(Hash) && context.params[:controller] == 'cms' && context.params[:action] == 'new'	16	if context.respond_to?(:params) && context.params.kind_of?(Hash) && context.params[:controller] == 'cms' && context.params[:action] == 'new'
17	types = []	17	types = []
18	- parent_id = context.params[:parent_id]	18	+ parent_id = context.params[:parent_id] \|\| (context.params[:article][:parent_id] unless context.params[:article].nil?)
19	parent = parent_id ? context.profile.articles.find(parent_id) : nil	19	parent = parent_id ? context.profile.articles.find(parent_id) : nil
20	types << ProposalsDiscussionPlugin::Discussion	20	types << ProposalsDiscussionPlugin::Discussion
21	types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)	21	types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)