ActionItem392: fixing tests by reworking articles's

description/short_description git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1856 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem392: fixing tests by reworking articles's
description/short_description git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1856 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent d0a31efb
Showing 10 changed files with 43 additions and 51 deletions Show diff stats
app/models/article.rb
app/models/profile.rb
db/migrate/035_specialize_articles.rb
test/unit/article_test.rb
test/unit/folder_test.rb
test/unit/image_gallery_test.rb
test/unit/rss_feed_test.rb
test/unit/textile_article_test.rb
test/unit/tiny_mce_article_test.rb
test/unit/uploaded_file_test.rb
@@ -80,28 +80,16 @@ class Article &lt; ActiveRecord::Base
     _('HTML Text document')
   end
-  def title
-    name
+  def self.description
+    raise NotImplementedError, "#{self} does not implement #description"
   end
   def self.short_description
-    if self == Article
-      _('Article')
-    else
-      _('"%s" article') % self.article_type_name
-    end
-  end
-
-  def self.description
-    if self == Article
-      _('An ordinary article')
-    else
-      _('An article of type "%s"') % self.article_type_name
-    end
+    raise NotImplementedError, "#{self} does not implement #short_description"
   end
-  def self.article_type_name
-    self.name.gsub(/article$/i, '')
+  def title
+    name
   end
   def url
@@ -257,7 +257,8 @@ class Profile &lt; ActiveRecord::Base
   hacked_after_create :insert_default_homepage_and_feed
   def insert_default_homepage_and_feed
-    hp = self.articles.build(:name => _("%s's home page") % self.name, :body => _("<p>This is a default homepage created for %s. It can be changed though the control panel.</p>") % self.name, :advertise => false)
+    hp = TinyMceArticle.new(:name => _("%s's home page") % self.name, :body => _("<p>This is a default homepage created for %s. It can be changed though the control panel.</p>") % self.name, :advertise => false)
+    hp.profile = self
     hp.save!
     self.home_page = hp
     self.save!
@@ -0,0 +1,9 @@
+class SpecializeArticles < ActiveRecord::Migration
+  def self.up
+    execute "update articles set type = 'TinyMceArticle' where type = 'Article'"
+  end
+
+  def self.down
+    raise ActiveRecord::Migration::IrreversibleMigration, 'cannot reverse this'
+  end
+end
@@ -136,19 +136,16 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal [other_first, fifth, fourth, third, second, first], Article.recent(6)
   end
-  should 'provied proper descriptions' do
-    assert_equal "Article", Article.short_description
-    assert_equal "An ordinary article", Article.description
+  should 'require that subclasses define description' do
+    assert_raise NotImplementedError do
+      Article.description
+    end
   end
-  should 'provide a usable descriptions to subclasses that don\'t override them' do
-    klass = Class.new(Article)
-    klass.stubs(:name).returns("MyClass")
-    klass.expects(:_).with('"%s" article').returns('"%s" article')
-    klass.expects(:_).with('An article of type "%s"').returns('An article of type "%s"')
-
-    assert_equal '"MyClass" article', klass.short_description
-    assert_equal 'An article of type "MyClass"', klass.description
+  should 'require that subclasses define short description' do
+    assert_raise NotImplementedError do
+      Article.short_description
+    end
   end
   should 'indicate wheter children articles are allowed or not' do
@@ -289,4 +286,5 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal true, a1.display_to?(member)
   end
+
 end
@@ -7,13 +7,11 @@ class FolderTest &lt; ActiveSupport::TestCase
   end
   should 'provide proper description' do
-    Folder.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.description, Folder.description
+    assert_kind_of String, Folder.description
   end
   should 'provide proper short description' do
-    Folder.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.short_description, Folder.short_description
+    assert_kind_of String, Folder.short_description
   end
   should 'provide own icon name' do
@@ -7,13 +7,11 @@ class ImageGalleryTest &lt; Test::Unit::TestCase
   end
   should 'provide description' do
-    ImageGallery.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.description, ImageGallery.description
+    assert_kind_of String, ImageGallery.description
   end
   should 'provide short description' do
-    ImageGallery.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.short_description, ImageGallery.short_description
+    assert_kind_of String, ImageGallery.short_description
   end
 end
@@ -188,13 +188,11 @@ class RssFeedTest &lt; Test::Unit::TestCase
   end
   should 'provide proper short description' do
-    RssFeed.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.short_description, RssFeed.short_description
+    assert_kind_of String, RssFeed.short_description
   end
   should 'provide proper description' do
-    RssFeed.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.description, RssFeed.description
+    assert_kind_of String, RssFeed.description
   end
   should 'provide the correct icon name' do
@@ -8,15 +8,11 @@ class TextileArticleTest &lt; Test::Unit::TestCase
   attr_reader :profile
   should 'provide a proper short description' do
-    # not test the actual text, though
-    TextileArticle.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.short_description, TextileArticle.short_description
+    assert_kind_of String, TextileArticle.short_description
   end
   should 'provide a proper description' do
-    # not test the actual text, though
-    TextileArticle.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.description, TextileArticle.description
+    assert_kind_of String, TextileArticle.description
   end
   should 'convert Textile to HTML' do
@@ -7,4 +7,12 @@ class TinyMceArticleTest &lt; Test::Unit::TestCase
     assert_subclass TextArticle, TinyMceArticle
   end
+  should 'define description' do
+    assert_kind_of String, TinyMceArticle.description
+  end
+
+  should 'define short description' do
+    assert_kind_of String, TinyMceArticle.short_description
+  end
+
 end
@@ -28,13 +28,11 @@ class UploadedFileTest &lt; Test::Unit::TestCase
   end 
   should 'provide proper description' do
-    UploadedFile.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.description, UploadedFile.description
+    assert_kind_of String, UploadedFile.description
   end
   should 'provide proper short description' do
-    UploadedFile.stubs(:==).with(Article).returns(true)
-    assert_not_equal Article.short_description, UploadedFile.short_description
+    assert_kind_of String, UploadedFile.short_description
   end
   should 'set name from uploaded filename' do
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class SpecializeArticles < ActiveRecord::Migration
	2	+ def self.up
	3	+ execute "update articles set type = 'TinyMceArticle' where type = 'Article'"
	4	+ end
	5	+
	6	+ def self.down
	7	+ raise ActiveRecord::Migration::IrreversibleMigration, 'cannot reverse this'
	8	+ end
	9	+end
	@@ -7,4 +7,12 @@ class TinyMceArticleTest < Test::Unit::TestCase		@@ -7,4 +7,12 @@ class TinyMceArticleTest < Test::Unit::TestCase
7	assert_subclass TextArticle, TinyMceArticle	7	assert_subclass TextArticle, TinyMceArticle
8	end	8	end
9		9
		10	+ should 'define description' do
		11	+ assert_kind_of String, TinyMceArticle.description
		12	+ end
		13	+
		14	+ should 'define short description' do
		15	+ assert_kind_of String, TinyMceArticle.short_description
		16	+ end
		17	+
10	end	18	end