From 4a8a46ccc77b342f31ab60dafeb0b84ab538b190 Mon Sep 17 00:00:00 2001 From: Pete Higgins Date: Fri, 6 Jan 2012 11:33:13 -0800 Subject: The newest factory_girl apparently doesn't like how this worked. --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ea550e2..9d4bffe 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -23,9 +23,9 @@ end def each_run FactoryGirl.reload ActiveSupport::Dependencies.clear - + load_all 'spec/support/**/*.rb' - load_all 'spec/factories/**/*.rb' + load_all 'spec/factories/**/*.rb' if FactoryGirl.factories.none? end # If spork is available in the Gemfile it'll be used but we don't force it. -- cgit v1.2.3