From 112531c1b6f41ca12da3664bbc9dac4d867108d7 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Sat, 3 Aug 2013 12:26:18 -0300
Subject: [PATCH] rails3: fix ArticleCategorization unit tests

---
 test/unit/article_categorization_test.rb | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/test/unit/article_categorization_test.rb b/test/unit/article_categorization_test.rb
index 78dd9d6..f31846e 100644
--- a/test/unit/article_categorization_test.rb
+++ b/test/unit/article_categorization_test.rb
@@ -9,17 +9,21 @@ class ArticleCategorizationTest < ActiveSupport::TestCase
   should 'belong to article' do
     p = create_user('testuser').person
     article = p.articles.build(:name => 'test article'); article.save!
-    assert_equal article, ArticleCategorization.new(:article => article).article
+    categorization = ArticleCategorization.new
+    categorization.article = article
+    assert_equal article, categorization.article
   end
 
   should 'belong to category' do
-    category = Category.create!(:name => 'one category', :environment => Environment.default)
-    assert_equal category, ArticleCategorization.new(:category => category).category
+    category = create_category('one category')
+    categorization = ArticleCategorization.new
+    categorization.category = category
+    assert_equal category, categorization.category
   end
 
   should 'create instances for the entire hierarchy' do
-    c1 = Category.create!(:name => 'c1', :environment => Environment.default)
-    c2 = c1.children.create!(:name => 'c2', :environment => Environment.default)
+    c1 = create_category('c1')
+    c2 = create_category('c2', c1)
 
     p = create_user('testuser').person
     a = p.articles.create!(:name => 'test')
@@ -32,9 +36,9 @@ class ArticleCategorizationTest < ActiveSupport::TestCase
   end
 
   should 'not duplicate entry for category that is parent of two others' do
-    c1 = Category.create!(:name => 'c1', :environment => Environment.default)
-    c2 = c1.children.create!(:name => 'c2', :environment => Environment.default)
-    c3 = c1.children.create!(:name => 'c3', :environment => Environment.default)
+    c1 = create_category('c1')
+    c2 = create_category('c2', c1)
+    c3 = create_category('c3', c1)
 
     p = create_user('testuser').person
     a = p.articles.create!(:name => 'test')
@@ -46,9 +50,9 @@ class ArticleCategorizationTest < ActiveSupport::TestCase
   end
 
   should 'remove all instances for a given article' do
-    c1 = Category.create!(:name => 'c1', :environment => Environment.default)
-    c2 = c1.children.create!(:name => 'c2', :environment => Environment.default)
-    c3 = c1.children.create!(:name => 'c3', :environment => Environment.default)
+    c1 = create_category('c1')
+    c2 = create_category('c2', c1)
+    c3 = create_category('c3', c1)
 
     p = create_user('testuser').person
     a = p.articles.create!(:name => 'test')
@@ -62,8 +66,8 @@ class ArticleCategorizationTest < ActiveSupport::TestCase
   end
 
   should 'not duplicate when adding the parent of a category by witch the article is already categorized' do
-    c1 = Category.create!(:name => 'c1', :environment => Environment.default)
-    c2 = c1.children.create!(:name => 'c2', :environment => Environment.default)
+    c1 = create_category('c1')
+    c2 = create_category('c2', c1)
 
     p = create_user('testuser').person
     a = p.articles.create!(:name => 'test')
@@ -75,8 +79,8 @@ class ArticleCategorizationTest < ActiveSupport::TestCase
   end
 
   should 'make parent real when categorized after child' do
-    c1 = Category.create!(:name => 'c1', :environment => Environment.default)
-    c2 = c1.children.create!(:name => 'c2', :environment => Environment.default)
+    c1 = create_category('c1')
+    c2 = create_category('c2', c1)
 
     p = create_user('testuser').person
     a = p.articles.create!(:name => 'test')
@@ -85,4 +89,14 @@ class ArticleCategorizationTest < ActiveSupport::TestCase
 
     assert ArticleCategorization.find(:first, :conditions => [ 'category_id = ? and article_id = ? and not virtual', c1.id, a.id ]), 'categorization must be promoted to not virtual'
   end
+
+  private
+
+  def create_category(name, parent = nil)
+    c = Category.new(:name => name)
+    c.environment = Environment.default
+    c.parent = parent
+    c.save!
+    c
+  end
 end
--
libgit2 0.21.2