Moving duplicated creation code into factory

This way we can reuse that logic (fast creation with a category and/or adding a category) in other tests for search functionality.

Moving duplicated creation code into factory
This way we can reuse that logic (fast creation with a category and/or adding a category) in other tests for search functionality.
Antonio Terceiro
1 parent 411cbf6d
Showing 2 changed files with 16 additions and 9 deletions Show diff stats
test/factories.rb
test/functional/search_controller_test.rb
@@ -11,7 +11,20 @@ module Noosfero::Factory
     else
       fast_insert(klass, data)
     end
-    return klass.last(:order => "id")
+    obj = klass.last(:order => "id")
+    if options[:category]
+      categories = options[:category]
+      unless categories.is_a?(Array)
+        categories = [categories]
+      end
+      categories.each do |category|
+        obj.add_category(category)
+      end
+    end
+    if options[:search]
+      obj.ferret_create
+    end
+    obj
   end
  
   def create(name, attrs = {})
@@ -14,17 +14,11 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   end
  
   def create_article_with_optional_category(name, profile, category = nil)
-    article = fast_create(Article, :name => name, :profile_id => profile.id)
-    article.add_category(category) if category
-    article.ferret_create
-    article
+    fast_create(Article, {:name => name, :profile_id => profile.id }, :search => true, :category => category)
   end
  
   def create_profile_with_optional_category(klass, name, category = nil, data = {})
-    profile = fast_create(klass, { :name => name }.merge(data))
-    profile.add_category(category) if category
-    profile.ferret_create
-    profile
+    fast_create(klass, { :name => name }.merge(data), :search => true, :category => category)
   end
  
   def test_local_files_reference
...	...	@@ -11,7 +11,20 @@ module Noosfero::Factory
11	11	else
12	12	fast_insert(klass, data)
13	13	end
14		- return klass.last(:order => "id")
	14	+ obj = klass.last(:order => "id")
	15	+ if options[:category]
	16	+ categories = options[:category]
	17	+ unless categories.is_a?(Array)
	18	+ categories = [categories]
	19	+ end
	20	+ categories.each do \|category\|
	21	+ obj.add_category(category)
	22	+ end
	23	+ end
	24	+ if options[:search]
	25	+ obj.ferret_create
	26	+ end
	27	+ obj
15	28	end
16	29
17	30	def create(name, attrs = {})
...	...
...	...	@@ -14,17 +14,11 @@ class SearchControllerTest < Test::Unit::TestCase
14	14	end
15	15
16	16	def create_article_with_optional_category(name, profile, category = nil)
17		- article = fast_create(Article, :name => name, :profile_id => profile.id)
18		- article.add_category(category) if category
19		- article.ferret_create
20		- article
	17	+ fast_create(Article, {:name => name, :profile_id => profile.id }, :search => true, :category => category)
21	18	end
22	19
23	20	def create_profile_with_optional_category(klass, name, category = nil, data = {})
24		- profile = fast_create(klass, { :name => name }.merge(data))
25		- profile.add_category(category) if category
26		- profile.ferret_create
27		- profile
	21	+ fast_create(klass, { :name => name }.merge(data), :search => true, :category => category)
28	22	end
29	23
30	24	def test_local_files_reference
...	...