diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-17 17:39:51 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-17 17:39:51 +0100 |
| commit | 6fbcb461025dc315d688038d9f0a8e138d00ba33 (patch) | |
| tree | 628ad3d7bf9cb2310bc2bed2e94b8670532a0dd4 /spec/spec_helper.rb | |
| parent | abde5e4a1139c41c6db23ce041fba090674f65ac (diff) | |
| parent | f41ec6d1cb167058a808b7820da5345c6da962fd (diff) | |
Merge branch 'feature/hide-individual-responses' into rails-3-develop
Conflicts:
Gemfile
app/views/admin_request/edit_outgoing.html.erb
config/packages
doc/CHANGES.md
doc/INSTALL.md
spec/models/info_request_spec.rb
spec/models/public_body_spec.rb
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 86ca5150a..0d8f8fac5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -155,5 +155,7 @@ Spork.prefork do end Spork.each_run do + FactoryGirl.definition_file_paths = [ Rails.root.join('spec', 'factories') ] + FactoryGirl.reload # This code will be run each time you run your specs. end |