From 6a02c97ef9217d3a638c5ae81e8b5ec4b4975816 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Fri, 18 Dec 2009 08:58:43 -0300 Subject: [PATCH] Moving duplicated creation code into factory --- test/factories.rb | 15 ++++++++++++++- test/functional/search_controller_test.rb | 10 ++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/test/factories.rb b/test/factories.rb index aa96fc9..42a3b4e 100644 --- a/test/factories.rb +++ b/test/factories.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 = {}) diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 11b4798..4bcd609 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -14,17 +14,11 @@ class SearchControllerTest < 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 -- libgit2 0.21.2