Added pagination to cms and to public view of folder

(ActionItem1689)

Added pagination to cms and to public view of folder
(ActionItem1689)
Daniela Feitosa · Antonio Terceiro
1 parent 868f9ba4
Showing 11 changed files with 173 additions and 72 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/cms_helper.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/views/cms/view.rhtml
app/views/content_viewer/folder.rhtml
app/views/shared/articles_list.rhtml
test/functional/cms_controller_test.rb
test/unit/cms_helper_test.rb
test/unit/folder_helper_test.rb
test/unit/profile_test.rb
@@ -61,17 +61,24 @@ class CmsController &lt; MyProfileController
   def view
     @article = profile.articles.find(params[:id])
-    @subitems = @article.children.reject {|item| item.folder? }
+    conditions = []
     if @article.blog?
-      @subitems.reject! {|item| item.class == RssFeed }
+      conditions = ['type != ?', 'RssFeed']
     end
-    @folders = @article.children.select {|item| item.folder? }
+
+    @articles = @article.children.find(
+                         :all,
+                         :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC",
+                         :conditions => conditions
+                         ).paginate(:per_page => per_page, :page => params[:npage])
   end
   def index
     @article = nil
-    @subitems = profile.top_level_articles.reject {|item| item.folder? }
-    @folders = profile.top_level_articles.select {|item| item.folder?}
+    @articles = profile.top_level_articles.find(
+                         :all,
+                         :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC"
+                         ).paginate(:per_page => per_page, :page => params[:npage])
     render :action => 'view'
   end
@@ -27,4 +27,30 @@ module CmsHelper
     article_helper.custom_options_for_article(article)
   end
+  def link_to_article(article)
+    article_name = short_filename(article.name, 30)
+    if article.folder?
+      link_to article_name, :action => 'view', :id => article.id
+    else
+      link_to article_name, article.url
+    end
+  end
+
+  def display_spread_button(profile, article)
+    if profile.person?
+      button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
+    elsif profile.community? && environment.portal_community
+      button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
+    end
+  end
+
+  def display_delete_button(article)
+    confirm_message = if article.folder?
+        _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!')
+      else
+        _('Are you sure that you want to remove this item?')
+      end
+
+    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => confirm_message
+  end
 end
@@ -4,11 +4,12 @@ module FolderHelper
   def list_articles(articles, recursive = false)
     if !articles.blank?
-      content_tag(
-        'table',
-        content_tag('tr', content_tag('th', _('Title')) + content_tag('th', _('Last update'))) +
-        articles.sort_by { |article| article.updated_at }.reverse.map {|item| display_article_in_listing(item, recursive, 0)}.join('')
-      )
+      articles = articles.find(
+                         :all,
+                         :order => "updated_at DESC"
+                         ).paginate(:per_page => 10, :page => params[:npage])
+
+      render :file => 'shared/articles_list', :locals => {:articles => articles, :recursive => recursive}
     else
       content_tag('em', _('(empty folder)'))
     end
@@ -110,9 +110,9 @@ class Article &lt; ActiveRecord::Base
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
-  def self.top_level_for(profile)
-    self.find(:all, :conditions => [ 'parent_id is null and profile_id = ?', profile.id ])
-  end
+  named_scope :top_level_for, lambda { |profile|
+    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
+  }
   # retrieves the latest +limit+ articles, sorted from the most recent to the
   # oldest.
@@ -46,51 +46,27 @@
     </tr>
   <% end %>
-  <%# folders %>
-  <% for folder in @folders %>
+  <% @articles.each do |article| %>
     <tr>
       <td>
-        <%= image_tag(icon_for_article(folder)) %>
-        <%= link_to folder.name, :action => 'view', :id => folder.id %>
+        <%= image_tag(icon_for_article(article)) %>
+        <%= link_to_article(article) %>
       </td>
       <td>
-        <%= folder.class.short_description %>
+        <%= article.class.short_description %>
       </td>
       <td class="article-controls">
-        <%= button_without_text :edit, _('Properties'), :action => 'edit', :id => folder.id %>
-        <%= button_without_text :eyes, _('Public view'), folder.url %>
+        <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
+        <%= button_without_text :eyes, _('Public view'), article.url %>
+        <%= display_spread_button(profile, article) unless article.folder? %>
         <% if !environment.enabled?('cant_change_homepage') %>
-          <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => folder.id }, :method => :post %>
+          <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
         <% end %>
-        <%= button_without_text :delete, _('Delete'), { :action => 'destroy', :id => folder.id }, :method => :post, :confirm => _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!') %>
-      </td>
-    </tr>
-  <% end %>
-
-  <%# non-folder subitems %>
-  <% for item in @subitems %>
-    <tr>
-      <td>
-        <%= image_tag(icon_for_article(item)) %>
-        <%= link_to short_filename(item.name,30), item.url %>
-      </td>
-      <td>
-        <%= item.class.short_description %>
-      </td>
-      <td class="article-controls">
-        <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => item.id %>
-        <%= button_without_text :eyes, _('Public view'), item.url %>
-        <% if profile.person? %>
-          <%= button_without_text :spread, _('Spread this'), :action => 'publish', :id => item.id %>
-        <% elsif profile.community? && environment.portal_community %>
-          <%= button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => item.id %>
-        <% end %>
-        <% if !environment.enabled?('cant_change_homepage') %>
-          <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => item.id }, :method => :post %>
-        <% end %>
-        <%= button_without_text :delete, _('Delete'), { :action => 'destroy', :id => item.id }, :method => :post, :confirm => _('Are you sure that you want to remove this item?') %>
+        <%= display_delete_button(article) %>
       </td>
     </tr>
   <% end %>
 </table>
+
+<%= pagination_links @articles, {:param_name => 'npage', :prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;', :page_links => true} %>
@@ -8,5 +8,5 @@
 <% if folder.children.empty? %>
   <em><%= _('(empty folder)') %></em>
 <% else %>
-  <%= list_articles(available_articles(folder.children, user)) %>
+  <%= list_articles(folder.children) %>
 <% end %>
@@ -0,0 +1,14 @@
+<table>
+
+  <tr>
+    <th><%= _('Title') %></th>
+    <th><%= _('Last update') %></th>
+  </tr>
+  <% articles.each do |article| %>
+    <% if article.display_to?(user) %>
+      <%= display_article_in_listing(article, recursive, 0) %>
+    <% end %>
+  <% end %>
+</table>
+
+<p><%= pagination_links(articles, {:param_name => 'npage', :prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;', :page_links => true}) %></p>
@@ -34,7 +34,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_template 'view'
     assert_equal profile, assigns(:profile)
     assert_nil assigns(:article)
-    assert_kind_of Array, assigns(:subitems)
+    assert_kind_of Array, assigns(:articles)
   end
   should 'be able to view a particular document' do
@@ -46,9 +46,9 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_template 'view'
     assert_equal a, assigns(:article)
-    assert_equal [], assigns(:subitems)
+    assert_equal [], assigns(:articles)
-    assert_kind_of Array, assigns(:subitems)
+    assert_kind_of Array, assigns(:articles)
   end
   should 'be able to edit a document' do
@@ -84,7 +84,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'display set as home page link to non folder' do
-    a = profile.articles.create!(:name => 'my new home page')
+    a = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now)
     Article.stubs(:short_description).returns('bli')
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :content => 'Use as homepage', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/set_home_page/#{a.id}" }
@@ -452,26 +452,27 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'parent_id', :value => profile.home_page.id }
   end
-  should 'list folders at top level' do
-    Folder.destroy_all
-    f1 = Folder.new(:name => 'f1'); profile.articles << f1;  f1.save!
-    f2 = Folder.new(:name => 'f2'); profile.articles << f2;  f2.save!
+  should 'list folders before others' do
+    profile.articles.destroy_all
+
+    folder1 = fast_create(Folder, :profile_id => profile.id, :updated_at => DateTime.now - 1.hour)
+    article = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now)
+    folder2 = fast_create(Folder, :profile_id => profile.id, :updated_at => DateTime.now + 1.hour)
     get :index, :profile => profile.identifier
-    assert_equal [f1, f2], assigns(:folders)
-    assert_not_includes assigns(:subitems), f1
-    assert_not_includes assigns(:subitems), f2
+    assert_equal [folder2, folder1, article], assigns(:articles)
   end
   should 'list folders inside another folder' do
-    parent = Folder.new(:name => 'parent'); profile.articles << parent;  parent.save!
-    f1 = Folder.new(:name => 'f1', :parent => parent); profile.articles << f1;  f1.save!
-    f2 = Folder.new(:name => 'f2', :parent => parent); profile.articles << f2;  f2.save!
+    profile.articles.destroy_all
+
+    parent = fast_create(Folder, :profile_id => profile.id)
+    folder1 = fast_create(Folder, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now - 1.hour)
+    article = fast_create(TextileArticle, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now)
+    folder2 = fast_create(Folder, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now + 1.hour)
     get :view, :profile => profile.identifier, :id => parent.id
-    assert_equal [f1, f2], assigns(:folders)
-    assert_not_includes assigns(:subitems), f1
-    assert_not_includes assigns(:subitems), f2
+    assert_equal [folder2, folder1, article], assigns(:articles)
   end
   should 'offer to create new top-level folder' do
@@ -1190,7 +1191,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should "display 'Publish' when profile is a person" do
-    a = profile.articles.create!(:name => 'my new home page')
+    a = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now)
     Article.stubs(:short_description).returns('bli')
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :attributes => {:href => "/myprofile/#{profile.identifier}/cms/publish/#{a.id}"}
@@ -1200,7 +1201,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     community = fast_create(Community)
     community.add_member(profile)
     Environment.any_instance.stubs(:portal_community).returns(community)
-    a = community.articles.create!(:name => 'my new home page')
+    a = fast_create(TextileArticle, :profile_id => community.id, :updated_at => DateTime.now)
     Article.stubs(:short_description).returns('bli')
     get :index, :profile => community.identifier
     assert_tag :tag => 'a', :attributes => {:href => "/myprofile/#{community.identifier}/cms/publish_on_portal_community/#{a.id}"}
@@ -18,6 +18,74 @@ class CmsHelperTest &lt; Test::Unit::TestCase
     assert_match /id="article\[accept_comments\]" name="article\[accept_comments\]" type="hidden" value="0"/, result
   end
+  should 'display link to folder content if article is folder' do
+    profile = fast_create(Profile)
+    folder = fast_create(Folder, :name => 'My folder', :profile_id => profile.id)
+    expects(:link_to).with('My folder', :action => 'view', :id => folder.id)
+
+    result = link_to_article(folder)
+  end
+
+  should 'display link to article if article is not folder' do
+    profile = fast_create(Profile)
+    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
+    expects(:link_to).with('My article', article.url)
+
+    result = link_to_article(article)
+  end
+
+  should 'display spread button when profile is a person' do
+    profile = fast_create(Person)
+    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
+    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish', :id => article.id)
+
+    result = display_spread_button(profile, article)
+  end
+
+  should 'display spread button when profile is a community and env has portal_community' do
+    env = fast_create(Environment)
+    env.expects(:portal_community).returns(true)
+    profile = fast_create(Community, :environment_id => env.id)
+    expects(:environment).returns(env)
+
+    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
+
+    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id)
+
+    result = display_spread_button(profile, article)
+  end
+
+  should 'not display spread button when profile is a community and env has not portal_community' do
+    env = fast_create(Environment)
+    env.expects(:portal_community).returns(nil)
+    profile = fast_create(Community, :environment_id => env.id)
+    expects(:environment).returns(env)
+
+    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
+
+    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id).never
+
+    result = display_spread_button(profile, article)
+  end
+
+  should 'display delete_button to folder' do
+    profile = fast_create(Profile)
+    folder = fast_create(Folder, :name => 'My folder', :profile_id => profile.id)
+    confirm_message = 'Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!'
+    expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message)
+
+    result = display_delete_button(folder)
+  end
+
+  should 'display delete_button to article' do
+    profile = fast_create(Profile)
+    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
+    confirm_message = 'Are you sure that you want to remove this item?'
+    expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message)
+
+    result = display_delete_button(article)
+  end
+
 end
 module RssFeedHelper
@@ -77,8 +77,16 @@ class FolderHelperTest &lt; Test::Unit::TestCase
   should 'list subitems as HTML content' do
     profile = create_user('folder-owner').person
     folder = fast_create(Folder, {:name => 'Parent Folder', :profile_id => profile.id})
-    article = fast_create(Article, {:name => 'Article1', :parent_id => folder.id, :profile_id => profile.id})
-    article = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id})
+    article1 = fast_create(Article, {:name => 'Article1', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
+    article2 = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
+    self.stubs(:params).returns({:npage => nil})
+
+    articles = folder.children.find(:all, :order => 'updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
+    expects(:user).returns(profile).at_least_once
+    expects(:recursive).returns(false).at_least_once
+    expects(:pagination_links).with(anything, anything).returns('')
+    list = render 'shared/articles_list', binding
+    expects(:render).with(:file => 'shared/articles_list', :locals => { :articles => articles, :recursive => false}).returns(list)
     result = list_articles(folder.children)
@@ -193,10 +193,10 @@ class ProfileTest &lt; Test::Unit::TestCase
     list = profile.top_level_articles
     same_list = profile.top_level_articles
-    assert_same list, same_list
+    assert_equal list.object_id, same_list.object_id
     other_list = profile.top_level_articles(true)
-    assert_not_same list, other_list
+    assert_not_equal list.object_id, other_list.object_id
   end
   should 'be able to find profiles by their names with ferret' do
	@@ -27,4 +27,30 @@ module CmsHelper		@@ -27,4 +27,30 @@ module CmsHelper
27	article_helper.custom_options_for_article(article)	27	article_helper.custom_options_for_article(article)
28	end	28	end
29		29
		30	+ def link_to_article(article)
		31	+ article_name = short_filename(article.name, 30)
		32	+ if article.folder?
		33	+ link_to article_name, :action => 'view', :id => article.id
		34	+ else
		35	+ link_to article_name, article.url
		36	+ end
		37	+ end
		38	+
		39	+ def display_spread_button(profile, article)
		40	+ if profile.person?
		41	+ button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
		42	+ elsif profile.community? && environment.portal_community
		43	+ button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
		44	+ end
		45	+ end
		46	+
		47	+ def display_delete_button(article)
		48	+ confirm_message = if article.folder?
		49	+ _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!')
		50	+ else
		51	+ _('Are you sure that you want to remove this item?')
		52	+ end
		53	+
		54	+ button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => confirm_message
		55	+ end
30	end	56	end
	@@ -46,51 +46,27 @@		@@ -46,51 +46,27 @@
46	</tr>	46	</tr>
47	<% end %>	47	<% end %>
48		48
49	- <%# folders %>
50	- <% for folder in @folders %>	49	+ <% @articles.each do \|article\| %>
51	<tr>	50	<tr>
52	<td>	51	<td>
53	- <%= image_tag(icon_for_article(folder)) %>
54	- <%= link_to folder.name, :action => 'view', :id => folder.id %>	52	+ <%= image_tag(icon_for_article(article)) %>
		53	+ <%= link_to_article(article) %>
55	</td>	54	</td>
56	<td>	55	<td>
57	- <%= folder.class.short_description %>	56	+ <%= article.class.short_description %>
58	</td>	57	</td>
59	<td class="article-controls">	58	<td class="article-controls">
60	- <%= button_without_text :edit, _('Properties'), :action => 'edit', :id => folder.id %>
61	- <%= button_without_text :eyes, _('Public view'), folder.url %>	59	+ <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
		60	+ <%= button_without_text :eyes, _('Public view'), article.url %>
		61	+ <%= display_spread_button(profile, article) unless article.folder? %>
62	<% if !environment.enabled?('cant_change_homepage') %>	62	<% if !environment.enabled?('cant_change_homepage') %>
63	- <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => folder.id }, :method => :post %>	63	+ <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
64	<% end %>	64	<% end %>
65	- <%= button_without_text :delete, _('Delete'), { :action => 'destroy', :id => folder.id }, :method => :post, :confirm => _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!') %>
66	- </td>
67	- </tr>
68	- <% end %>
69	-
70	- <%# non-folder subitems %>
71	- <% for item in @subitems %>
72	- <tr>
73	- <td>
74	- <%= image_tag(icon_for_article(item)) %>
75	- <%= link_to short_filename(item.name,30), item.url %>
76	- </td>
77	- <td>
78	- <%= item.class.short_description %>
79	- </td>
80	- <td class="article-controls">
81	- <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => item.id %>
82	- <%= button_without_text :eyes, _('Public view'), item.url %>
83	- <% if profile.person? %>
84	- <%= button_without_text :spread, _('Spread this'), :action => 'publish', :id => item.id %>
85	- <% elsif profile.community? && environment.portal_community %>
86	- <%= button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => item.id %>
87	- <% end %>
88	- <% if !environment.enabled?('cant_change_homepage') %>
89	- <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => item.id }, :method => :post %>
90	- <% end %>
91	- <%= button_without_text :delete, _('Delete'), { :action => 'destroy', :id => item.id }, :method => :post, :confirm => _('Are you sure that you want to remove this item?') %>	65	+ <%= display_delete_button(article) %>
92	</td>	66	</td>
93	</tr>	67	</tr>
94	<% end %>	68	<% end %>
95		69
96	</table>	70	</table>
		71	+
		72	+<%= pagination_links @articles, {:param_name => 'npage', :prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »', :page_links => true} %>
	@@ -8,5 +8,5 @@		@@ -8,5 +8,5 @@
8	<% if folder.children.empty? %>	8	<% if folder.children.empty? %>
9	<em><%= _('(empty folder)') %></em>	9	<em><%= _('(empty folder)') %></em>
10	<% else %>	10	<% else %>
11	- <%= list_articles(available_articles(folder.children, user)) %>	11	+ <%= list_articles(folder.children) %>
12	<% end %>	12	<% end %>
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+<table>
	2	+
	3	+ <tr>
	4	+ <th><%= _('Title') %></th>
	5	+ <th><%= _('Last update') %></th>
	6	+ </tr>
	7	+ <% articles.each do \|article\| %>
	8	+ <% if article.display_to?(user) %>
	9	+ <%= display_article_in_listing(article, recursive, 0) %>
	10	+ <% end %>
	11	+ <% end %>
	12	+</table>
	13	+
	14	+<p><%= pagination_links(articles, {:param_name => 'npage', :prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »', :page_links => true}) %></p>
	@@ -18,6 +18,74 @@ class CmsHelperTest < Test::Unit::TestCase		@@ -18,6 +18,74 @@ class CmsHelperTest < Test::Unit::TestCase
18	assert_match /id="article\[accept_comments\]" name="article\[accept_comments\]" type="hidden" value="0"/, result	18	assert_match /id="article\[accept_comments\]" name="article\[accept_comments\]" type="hidden" value="0"/, result
19	end	19	end
20		20
		21	+ should 'display link to folder content if article is folder' do
		22	+ profile = fast_create(Profile)
		23	+ folder = fast_create(Folder, :name => 'My folder', :profile_id => profile.id)
		24	+ expects(:link_to).with('My folder', :action => 'view', :id => folder.id)
		25	+
		26	+ result = link_to_article(folder)
		27	+ end
		28	+
		29	+ should 'display link to article if article is not folder' do
		30	+ profile = fast_create(Profile)
		31	+ article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
		32	+ expects(:link_to).with('My article', article.url)
		33	+
		34	+ result = link_to_article(article)
		35	+ end
		36	+
		37	+ should 'display spread button when profile is a person' do
		38	+ profile = fast_create(Person)
		39	+ article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
		40	+ expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish', :id => article.id)
		41	+
		42	+ result = display_spread_button(profile, article)
		43	+ end
		44	+
		45	+ should 'display spread button when profile is a community and env has portal_community' do
		46	+ env = fast_create(Environment)
		47	+ env.expects(:portal_community).returns(true)
		48	+ profile = fast_create(Community, :environment_id => env.id)
		49	+ expects(:environment).returns(env)
		50	+
		51	+ article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
		52	+
		53	+ expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id)
		54	+
		55	+ result = display_spread_button(profile, article)
		56	+ end
		57	+
		58	+ should 'not display spread button when profile is a community and env has not portal_community' do
		59	+ env = fast_create(Environment)
		60	+ env.expects(:portal_community).returns(nil)
		61	+ profile = fast_create(Community, :environment_id => env.id)
		62	+ expects(:environment).returns(env)
		63	+
		64	+ article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
		65	+
		66	+ expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id).never
		67	+
		68	+ result = display_spread_button(profile, article)
		69	+ end
		70	+
		71	+ should 'display delete_button to folder' do
		72	+ profile = fast_create(Profile)
		73	+ folder = fast_create(Folder, :name => 'My folder', :profile_id => profile.id)
		74	+ confirm_message = 'Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!'
		75	+ expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message)
		76	+
		77	+ result = display_delete_button(folder)
		78	+ end
		79	+
		80	+ should 'display delete_button to article' do
		81	+ profile = fast_create(Profile)
		82	+ article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
		83	+ confirm_message = 'Are you sure that you want to remove this item?'
		84	+ expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message)
		85	+
		86	+ result = display_delete_button(article)
		87	+ end
		88	+
21	end	89	end
22		90
23	module RssFeedHelper	91	module RssFeedHelper
	@@ -77,8 +77,16 @@ class FolderHelperTest < Test::Unit::TestCase		@@ -77,8 +77,16 @@ class FolderHelperTest < Test::Unit::TestCase
77	should 'list subitems as HTML content' do	77	should 'list subitems as HTML content' do
78	profile = create_user('folder-owner').person	78	profile = create_user('folder-owner').person
79	folder = fast_create(Folder, {:name => 'Parent Folder', :profile_id => profile.id})	79	folder = fast_create(Folder, {:name => 'Parent Folder', :profile_id => profile.id})
80	- article = fast_create(Article, {:name => 'Article1', :parent_id => folder.id, :profile_id => profile.id})
81	- article = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id})	80	+ article1 = fast_create(Article, {:name => 'Article1', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
		81	+ article2 = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
		82	+ self.stubs(:params).returns({:npage => nil})
		83	+
		84	+ articles = folder.children.find(:all, :order => 'updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
		85	+ expects(:user).returns(profile).at_least_once
		86	+ expects(:recursive).returns(false).at_least_once
		87	+ expects(:pagination_links).with(anything, anything).returns('')
		88	+ list = render 'shared/articles_list', binding
		89	+ expects(:render).with(:file => 'shared/articles_list', :locals => { :articles => articles, :recursive => false}).returns(list)
82		90
83	result = list_articles(folder.children)	91	result = list_articles(folder.children)
84		92
	@@ -193,10 +193,10 @@ class ProfileTest < Test::Unit::TestCase		@@ -193,10 +193,10 @@ class ProfileTest < Test::Unit::TestCase
193		193
194	list = profile.top_level_articles	194	list = profile.top_level_articles
195	same_list = profile.top_level_articles	195	same_list = profile.top_level_articles
196	- assert_same list, same_list	196	+ assert_equal list.object_id, same_list.object_id
197		197
198	other_list = profile.top_level_articles(true)	198	other_list = profile.top_level_articles(true)
199	- assert_not_same list, other_list	199	+ assert_not_equal list.object_id, other_list.object_id
200	end	200	end
201		201
202	should 'be able to find profiles by their names with ferret' do	202	should 'be able to find profiles by their names with ferret' do