article_versions: list of versions on a new page

- Added pagination to versions - Treating access denied and not found (ActionItem2822)

article_versions: list of versions on a new page
- Added pagination to versions - Treating access denied and not found (ActionItem2822)
Daniela Feitosa
1 parent 8e720312
Showing 14 changed files with 130 additions and 76 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/article_helper.rb
app/models/article.rb
app/views/content_viewer/_article_toolbar.rhtml
app/views/content_viewer/_article_versions.rhtml
app/views/content_viewer/article_versions.rhtml
app/views/content_viewer/versioned_article.rhtml
app/views/content_viewer/view_page.rhtml
config/routes.rb
features/article_versioning.feature
public/stylesheets/application.css
test/functional/content_viewer_controller_test.rb
test/integration/routing_test.rb
test/unit/article_test.rb
@@ -7,7 +7,7 @@ class ContentViewerController &lt; ApplicationController
   def view_page
     path = params[:page].join('/')
-    @version = params[:version]
+    @version = params[:version].to_i
     if path.blank?
       @page = profile.home_page
@@ -46,7 +46,7 @@ class ContentViewerController &lt; ApplicationController
     if @version
       @versioned_article = @page.versions.find_by_version(@version)
-      unless @versioned_article == @page.versions.latest
+      if @versioned_article && @page.versions.latest.version != @versioned_article.version
         render :template => 'content_viewer/versioned_article.rhtml'
         return
       end
@@ -137,10 +137,16 @@ class ContentViewerController &lt; ApplicationController
     end
   end
-#  def article_versions
-#    @page = profile.articles.find(params[:page])
-#    @versions = @page.versions
-#  end
+  def article_versions
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    unless @page
+      render_not_found(@page)
+      return
+    end
+    render_access_denied unless @page.display_versions?
+    @versions = @page.versions.paginate(:per_page => per_page, :page => params[:npage])
+  end
   protected
@@ -28,7 +28,7 @@ module ArticleHelper
         'div',
         check_box(:article, :notify_comments) +
         content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
-        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked") 
+        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
       ) +
       content_tag(
@@ -42,7 +42,7 @@ module ArticleHelper
         'div',
         check_box(:article, :display_hits) +
         content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
-      ) : '') + 
+      ) : '') +
       (article.can_display_versions? ?
       content_tag(
@@ -618,7 +618,7 @@ class Article &lt; ActiveRecord::Base
   def author(version_number = nil)
     if version_number
       version = versions.find_by_version(version_number)
-      author_id = version.last_changed_by_id
+      author_id = version.last_changed_by_id if version
       Person.exists?(author_id) ? Person.find(author_id) : nil
     else
       if versions.empty?
@@ -48,6 +48,10 @@
       <%= expirable_button @page, :suggest, content, url, options %>
     <% end %>
+    <% if @page.display_versions? %>
+      <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+    <% end %>
+
     <%= report_abuse(profile, :link, @page) %>
   </div>
@@ -1,6 +0,0 @@
-<h3><%= _('Versions') %></h3>
-<ul class='article-versions'>
-  <% @page.versions.each do |v| %>
-    <li><%= link_to("#{v.version}", @page.url.merge(:version => v.version)) %></li>
-  <% end %>
-<ul>
@@ -0,0 +1,16 @@
+<%= article_title(@page, :no_link => true) %>
+
+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
+
+<ul class='article-versions'>
+  <% @versions.each do |v| %>
+    <li>
+      <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+      <%= @page.version == v.version ? _('(current)') : '' %>
+      <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
+      <div class='updated-on'><%= show_time(v.updated_at) %></div>
+    </li>
+  <% end %>
+</ul>
+
+<%= pagination_links @versions, :param_name => 'npage' %>
 <div id="article" class="<%= @page.css_class_name %>">
   <div id="article-actions">
+    <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+
     <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
-      <div id="article-revert-version">
-        <% content = content_tag('span', _('Revert to this version')) %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
-        <%= expirable_button @page, :edit, content, url %>
-      </div>
+      <% content = content_tag('span', _('Revert to this version')) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
+      <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
     <% end %>
   </div>
@@ -32,10 +32,6 @@
     </div> <!-- end class="article-body" -->
   <% end %>
-  <div id="article-versions">
-    <%= render :partial => 'article_versions' %>
-  </div>
-
   <%= display_source_info(@page) %>
 </div><!-- end id="article" -->
@@ -87,13 +87,6 @@
 <%= display_source_info(@page) %>
-<% if @page.display_versions? %>
-  <div id="article-versions">
-    <%= render :partial => 'article_versions' %>
-    <%#= button(:clock, _('See older versions'), :controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions', :page => @page.id) %>
-  </div>
-<% end %>
-
 <div class="comments" id="comments_list">
   <% if @page.accept_comments? || @comments_count > 0 %>
@@ -126,12 +126,14 @@ ActionController::Routing::Routes.draw do |map|
   # cache stuff - hack
   map.cache 'public/:action/:id', :controller => 'public'
+  map.connect ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  map.connect '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
   # match requests for profiles that don't have a custom domain
   map.homepage ':profile/*page', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
-
   # match requests for content in domains hosted for profiles
   map.connect '*page', :controller => 'content_viewer', :action => 'view_page'
+
 end
@@ -5,37 +5,67 @@ Feature: article versioning
   Background:
     Given the following users
-      | login | name |
+      | login     | name       |
       | joaosilva | Joao Silva |
     And "joaosilva" has no articles
     And the following articles
-      | owner | name | body |
-      | joaosilva | Sample Article | This is the first version of the article |
+      | owner     | name           | body                                     | display_versions |
+      | joaosilva | Sample Article | This is the first version of the article | true             |
     And the article "Sample Article" is updated with
-      | name | body |
+      | name           | body                                      |
       | Edited Article | This is the second version of the article |
     And I am logged in as "joaosilva"
-  Scenario: display only link for original version
+  @selenium
+  Scenario: enabling visualization of versions
     Given the following articles
-      | owner | name | body |
-      | joaosilva | One version article | This is the first published article |
-    And I am on joaosilva's control panel
-    And I follow "Manage Content"
-    When I follow "One version article"
-    Then I should see "r1" within "#article-versions"
-    And I should not see "r2" within "#article-versions"
+      | owner     | name        | body                       |
+      | joaosilva | New Article | Article to enable versions |
+   Given I am on article "New Article"
+    Then I should not see "All versions"
+    When I follow "Edit" within "#article-actions"
+    And I check "I want this article to display a link to older versions"
+    And I press "Save"
+    Then I should be on article "New Article"
+    And I should see "All versions"
-  Scenario: display links for versions
-    Given I am on joaosilva's control panel
-    And I follow "Manage Content"
-    When I follow "Edited Article"
-    Then I should see "r1" within "#article-versions"
-    And I should see "r2" within "#article-versions"
+  @selenium
+  Scenario: list versions of an article
+    Given I am on article "Edited Article"
+    When I follow "All versions"
+    Then I should be on /joaosilva/edited-article/versions
+    And I should see "Version 1" within ".article-versions"
+    And I should see "Version 2" within ".article-versions"
-  Scenario: display links for versions
-    Given I am on joaosilva's control panel
-    And I follow "Manage Content"
-    And I follow "Edited Article" 
-    When I follow "r2" within "#article-versions"
-    Then I should see "This is the first version of the article" within ".article-body"
+  @selenium
+  Scenario: see specific version
+    Given I go to article "Edited Article"
+    Then I should see "Edited Article" within ".title"
+    And I should see "This is the second version of the article" within ".article-body"
+    When I follow "All versions"
+    And I follow "Version 1"
+    Then I should see "Sample Article" within ".title"
+    And I should see "This is the first version of the article" within ".article-body"
+
+  @selenium
+  Scenario: revert to a specific version generates a new version
+    Given I go to article "Edited Article"
+    When I follow "All versions"
+    Then I should not see "Version 3" within ".article-versions"
+    And I follow "Version 1"
+    And I follow "Revert to this version"
+    And I press "Save"
+    Then I should see "Sample Article" within ".title"
+    When I follow "All versions"
+    Then I should see "Version 3" within ".article-versions"
+
+  Scenario: try to access versions of unexistent article
+    Given I go to /joaosilva/unexistent-article/versions
+    Then I should see "There is no such page"
+
+  Scenario: deny access to versions when disabled on article
+    Given the following articles
+      | owner     | name              | body                        | display_versions |
+      | joaosilva | Versions disabled | Versions can't be displayed | false            |
+    And I go to /joaosilva/versions-disabled/versions
+    Then I should see "Access denied"
@@ -6539,18 +6539,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   z-index: 1;
 }
-ul.article-versions {
-  padding: 0px;
-}
-
 ul.article-versions li {
-  display: inline;
   font-size: 13px;
-}
-
-#article ul.article-versions a.link-this-page {
-  text-decoration: none;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-
+  padding: 3px 0px;
 }
@@ -370,23 +370,32 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should "display current article's versions" do
-    page = profile.articles.create!(:name => 'myarticle', :body => 'test article')
+    page = TextArticle.create!(:name => 'myarticle', :body => 'test article', :display_versions => true, :profile => profile)
     page.body = 'test article edited'; page.save
-    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
-    assert_tag :tag => 'div', :attributes => { :id => 'article-versions' }, :descendant => {
+    get :article_versions, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'ul', :attributes => { :class => 'article-versions' }, :descendant => {
       :tag => 'a',
-      :attributes => { :href => "http://#{profile.environment.default_hostname}/#{profile.identifier}/#{page.path}?rev=1" }
+      :attributes => { :href => "http://#{profile.environment.default_hostname}/#{profile.identifier}/#{page.path}?version=1" }
     }
   end
   should "fetch correct article version" do
-    page = profile.articles.create!(:name => 'myarticle', :body => 'test article')
-    page.body = 'test article edited'; page.save
+    page = profile.articles.create!(:name => 'myarticle', :body => 'original article')
+    page.body = 'edited article'; page.save
     get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 1
-    assert_equal 1, assigns(:page).version
+    assert_tag :tag => 'div', :attributes => { :class => 'article-body article-body-article' }, :content => /original article/
+  end
+
+  should "display current article if version does not exist" do
+    page = profile.articles.create!(:name => 'myarticle', :body => 'original article')
+    page.body = 'edited article'; page.save
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 'bli'
+
+    assert_tag :tag => 'div', :attributes => { :class => 'article-body article-body-article' }, :content => /edited article/
   end
   should 'not return an article of a different user' do
@@ -256,4 +256,19 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/user_themes/aksdhf')
   end
+  should 'have route to versions of an article' do
+
+    assert_routing('/ze/work/free-software/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => 'ze', :page => ['work', "free-software"])
+  end
+
+  should 'have route to versions of an article if profile has domain' do
+    user = create_user('testuser').person
+    domain = Domain.create!(:name => 'example.com', :owner => user)
+
+    ActionController::TestRequest.any_instance.expects(:host).returns('www.example.com')
+
+    assert_routing('/work/free-software/versions', :controller => 'content_viewer', :action =>  'article_versions', :page => [ 'work', 'free-software'] )
+  end
+
+
 end
@@ -742,7 +742,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
  should 'use revision number to compose cache key' do
     a = fast_create(Article, :name => 'Versioned article', :profile_id => profile.id)
-    assert_match(/-rev-2/,a.cache_key(:version => 2))
+    assert_match(/-version-2/,a.cache_key(:version => 2))
   end
   should 'not be highlighted by default' do
	@@ -28,7 +28,7 @@ module ArticleHelper		@@ -28,7 +28,7 @@ module ArticleHelper
28	'div',	28	'div',
29	check_box(:article, :notify_comments) +	29	check_box(:article, :notify_comments) +
30	content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +	30	content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
31	- observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")	31	+ observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
32	) +	32	) +
33		33
34	content_tag(	34	content_tag(
	@@ -42,7 +42,7 @@ module ArticleHelper		@@ -42,7 +42,7 @@ module ArticleHelper
42	'div',	42	'div',
43	check_box(:article, :display_hits) +	43	check_box(:article, :display_hits) +
44	content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')	44	content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
45	- ) : '') +	45	+ ) : '') +
46		46
47	(article.can_display_versions? ?	47	(article.can_display_versions? ?
48	content_tag(	48	content_tag(
	@@ -618,7 +618,7 @@ class Article < ActiveRecord::Base		@@ -618,7 +618,7 @@ class Article < ActiveRecord::Base
618	def author(version_number = nil)	618	def author(version_number = nil)
619	if version_number	619	if version_number
620	version = versions.find_by_version(version_number)	620	version = versions.find_by_version(version_number)
621	- author_id = version.last_changed_by_id	621	+ author_id = version.last_changed_by_id if version
622	Person.exists?(author_id) ? Person.find(author_id) : nil	622	Person.exists?(author_id) ? Person.find(author_id) : nil
623	else	623	else
624	if versions.empty?	624	if versions.empty?
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-<h3><%= _('Versions') %></h3>
2	-<ul class='article-versions'>
3	- <% @page.versions.each do \|v\| %>
4	- <li><%= link_to("#{v.version}", @page.url.merge(:version => v.version)) %></li>
5	- <% end %>
6	-<ul>
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<%= article_title(@page, :no_link => true) %>
	2	+
	3	+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
	4	+
	5	+<ul class='article-versions'>
	6	+ <% @versions.each do \|v\| %>
	7	+ <li>
	8	+ <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
	9	+ <%= @page.version == v.version ? _('(current)') : '' %>
	10	+ <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
	11	+ <div class='updated-on'><%= show_time(v.updated_at) %></div>
	12	+ </li>
	13	+ <% end %>
	14	+</ul>
	15	+
	16	+<%= pagination_links @versions, :param_name => 'npage' %>
	@@ -87,13 +87,6 @@		@@ -87,13 +87,6 @@
87		87
88	<%= display_source_info(@page) %>	88	<%= display_source_info(@page) %>
89		89
90	-<% if @page.display_versions? %>
91	- <div id="article-versions">
92	- <%= render :partial => 'article_versions' %>
93	- <%#= button(:clock, _('See older versions'), :controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions', :page => @page.id) %>
94	- </div>
95	-<% end %>
96	-
97	<div class="comments" id="comments_list">	90	<div class="comments" id="comments_list">
98		91
99	<% if @page.accept_comments? \|\| @comments_count > 0 %>	92	<% if @page.accept_comments? \|\| @comments_count > 0 %>
	@@ -5,37 +5,67 @@ Feature: article versioning		@@ -5,37 +5,67 @@ Feature: article versioning
5		5
6	Background:	6	Background:
7	Given the following users	7	Given the following users
8	- \| login \| name \|	8	+ \| login \| name \|
9	\| joaosilva \| Joao Silva \|	9	\| joaosilva \| Joao Silva \|
10	And "joaosilva" has no articles	10	And "joaosilva" has no articles
11	And the following articles	11	And the following articles
12	- \| owner \| name \| body \|
13	- \| joaosilva \| Sample Article \| This is the first version of the article \|	12	+ \| owner \| name \| body \| display_versions \|
		13	+ \| joaosilva \| Sample Article \| This is the first version of the article \| true \|
14	And the article "Sample Article" is updated with	14	And the article "Sample Article" is updated with
15	- \| name \| body \|	15	+ \| name \| body \|
16	\| Edited Article \| This is the second version of the article \|	16	\| Edited Article \| This is the second version of the article \|
17	And I am logged in as "joaosilva"	17	And I am logged in as "joaosilva"
18		18
19	- Scenario: display only link for original version	19	+ @selenium
		20	+ Scenario: enabling visualization of versions
20	Given the following articles	21	Given the following articles
21	- \| owner \| name \| body \|
22	- \| joaosilva \| One version article \| This is the first published article \|
23	- And I am on joaosilva's control panel
24	- And I follow "Manage Content"
25	- When I follow "One version article"
26	- Then I should see "r1" within "#article-versions"
27	- And I should not see "r2" within "#article-versions"	22	+ \| owner \| name \| body \|
		23	+ \| joaosilva \| New Article \| Article to enable versions \|
		24	+ Given I am on article "New Article"
		25	+ Then I should not see "All versions"
		26	+ When I follow "Edit" within "#article-actions"
		27	+ And I check "I want this article to display a link to older versions"
		28	+ And I press "Save"
		29	+ Then I should be on article "New Article"
		30	+ And I should see "All versions"
28		31
29	- Scenario: display links for versions
30	- Given I am on joaosilva's control panel
31	- And I follow "Manage Content"
32	- When I follow "Edited Article"
33	- Then I should see "r1" within "#article-versions"
34	- And I should see "r2" within "#article-versions"	32	+ @selenium
		33	+ Scenario: list versions of an article
		34	+ Given I am on article "Edited Article"
		35	+ When I follow "All versions"
		36	+ Then I should be on /joaosilva/edited-article/versions
		37	+ And I should see "Version 1" within ".article-versions"
		38	+ And I should see "Version 2" within ".article-versions"
35		39
36	- Scenario: display links for versions
37	- Given I am on joaosilva's control panel
38	- And I follow "Manage Content"
39	- And I follow "Edited Article"
40	- When I follow "r2" within "#article-versions"
41	- Then I should see "This is the first version of the article" within ".article-body"	40	+ @selenium
		41	+ Scenario: see specific version
		42	+ Given I go to article "Edited Article"
		43	+ Then I should see "Edited Article" within ".title"
		44	+ And I should see "This is the second version of the article" within ".article-body"
		45	+ When I follow "All versions"
		46	+ And I follow "Version 1"
		47	+ Then I should see "Sample Article" within ".title"
		48	+ And I should see "This is the first version of the article" within ".article-body"
		49	+
		50	+ @selenium
		51	+ Scenario: revert to a specific version generates a new version
		52	+ Given I go to article "Edited Article"
		53	+ When I follow "All versions"
		54	+ Then I should not see "Version 3" within ".article-versions"
		55	+ And I follow "Version 1"
		56	+ And I follow "Revert to this version"
		57	+ And I press "Save"
		58	+ Then I should see "Sample Article" within ".title"
		59	+ When I follow "All versions"
		60	+ Then I should see "Version 3" within ".article-versions"
		61	+
		62	+ Scenario: try to access versions of unexistent article
		63	+ Given I go to /joaosilva/unexistent-article/versions
		64	+ Then I should see "There is no such page"
		65	+
		66	+ Scenario: deny access to versions when disabled on article
		67	+ Given the following articles
		68	+ \| owner \| name \| body \| display_versions \|
		69	+ \| joaosilva \| Versions disabled \| Versions can't be displayed \| false \|
		70	+ And I go to /joaosilva/versions-disabled/versions
		71	+ Then I should see "Access denied"
	@@ -6539,18 +6539,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {		@@ -6539,18 +6539,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6539	z-index: 1;	6539	z-index: 1;
6540	}	6540	}
6541		6541
6542	-ul.article-versions {
6543	- padding: 0px;
6544	-}
6545	-
6546	ul.article-versions li {	6542	ul.article-versions li {
6547	- display: inline;
6548	font-size: 13px;	6543	font-size: 13px;
6549	-}
6550	-
6551	-#article ul.article-versions a.link-this-page {
6552	- text-decoration: none;
6553	- opacity: 0.5;
6554	- filter: alpha(opacity=50);
6555	-	6544	+ padding: 3px 0px;
6556	}	6545	}
	@@ -256,4 +256,19 @@ class RoutingTest < ActionController::IntegrationTest		@@ -256,4 +256,19 @@ class RoutingTest < ActionController::IntegrationTest
256	assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/user_themes/aksdhf')	256	assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/user_themes/aksdhf')
257	end	257	end
258		258
		259	+ should 'have route to versions of an article' do
		260	+
		261	+ assert_routing('/ze/work/free-software/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => 'ze', :page => ['work', "free-software"])
		262	+ end
		263	+
		264	+ should 'have route to versions of an article if profile has domain' do
		265	+ user = create_user('testuser').person
		266	+ domain = Domain.create!(:name => 'example.com', :owner => user)
		267	+
		268	+ ActionController::TestRequest.any_instance.expects(:host).returns('www.example.com')
		269	+
		270	+ assert_routing('/work/free-software/versions', :controller => 'content_viewer', :action => 'article_versions', :page => [ 'work', 'free-software'] )
		271	+ end
		272	+
		273	+
259	end	274	end
	@@ -742,7 +742,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -742,7 +742,7 @@ class ArticleTest < ActiveSupport::TestCase
742		742
743	should 'use revision number to compose cache key' do	743	should 'use revision number to compose cache key' do
744	a = fast_create(Article, :name => 'Versioned article', :profile_id => profile.id)	744	a = fast_create(Article, :name => 'Versioned article', :profile_id => profile.id)
745	- assert_match(/-rev-2/,a.cache_key(:version => 2))	745	+ assert_match(/-version-2/,a.cache_key(:version => 2))
746	end	746	end
747		747
748	should 'not be highlighted by default' do	748	should 'not be highlighted by default' do