aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorPete Higgins <pete@peterhiggins.org>2012-01-06 11:33:13 -0800
committerPete Higgins <pete@peterhiggins.org>2012-01-06 11:33:13 -0800
commit4a8a46ccc77b342f31ab60dafeb0b84ab538b190 (patch)
tree7aff67d0c04827af3e7cafa78e78929fe9da4b7e /spec
parentd6e9af98ef6922715c92bb407363ee8346877e22 (diff)
downloadrefinerycms-blog-4a8a46ccc77b342f31ab60dafeb0b84ab538b190.tar.gz
refinerycms-blog-4a8a46ccc77b342f31ab60dafeb0b84ab538b190.tar.bz2
refinerycms-blog-4a8a46ccc77b342f31ab60dafeb0b84ab538b190.zip
The newest factory_girl apparently doesn't like how this worked.
Diffstat (limited to 'spec')
-rw-r--r--spec/spec_helper.rb4
1 files changed, 2 insertions, 2 deletions
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.