From a11937788e355660af430d4d75db78a7905d1b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20St=C4=99pie=C5=84?= Date: Mon, 5 Sep 2011 20:00:08 +0200 Subject: [PATCH] Prevent redefinition of factories This commit catches Factory::DuplicateDefinitionErrors raised by factory_girl 2.1.0. See the following thread for some background. http://groups.google.com/group/factory_girl/browse_thread/thread/4df21d9240c20198 --- spec/factories/factories.rb | 38 ++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/spec/factories/factories.rb b/spec/factories/factories.rb index 749e0b33..cbf6c0a5 100644 --- a/spec/factories/factories.rb +++ b/spec/factories/factories.rb @@ -1,21 +1,25 @@ -Factory.define :user do |u| - u.sequence(:login) { |n| "testuser#{n}" } - u.password "secret" - u.password_confirmation { |user| user.password } - u.is_admin false -end +begin + Factory.define :user do |u| + u.sequence(:login) { |n| "testuser#{n}" } + u.password "secret" + u.password_confirmation { |user| user.password } + u.is_admin false + end -Factory.define :context do |c| - c.sequence(:name) { |n| "testcontext#{n}" } - c.hide false - c.created_at Time.now.utc -end + Factory.define :context do |c| + c.sequence(:name) { |n| "testcontext#{n}" } + c.hide false + c.created_at Time.now.utc + end -Factory.define :project do |p| - p.sequence(:name) { |n| "testproject#{n}" } -end + Factory.define :project do |p| + p.sequence(:name) { |n| "testproject#{n}" } + end -Factory.define :todo do |t| - t.sequence(:description) { |n| "testtodo#{n}" } - t.association :context + Factory.define :todo do |t| + t.sequence(:description) { |n| "testtodo#{n}" } + t.association :context + end +rescue FactoryGirl::DuplicateDefinitionError + # No problem, apparently this file was included already. end