Commit d639d5ea by Prem Sichanugrist

Fix problem with the newer version of Factory Girl

Thanks @GMFlash!

Closes #586
parent 23cd662e
...@@ -109,8 +109,14 @@ if defined?(ActionController::Integration::Session) ...@@ -109,8 +109,14 @@ if defined?(ActionController::Integration::Session)
end end
end end
class Factory if defined?(FactoryGirl::Factory)
include Paperclip::Shoulda #:nodoc: class FactoryGirl::Factory
include Paperclip::Shoulda #:nodoc:
end
else
class Factory
include Paperclip::Shoulda #:nodoc:
end
end end
class Test::Unit::TestCase #:nodoc: class Test::Unit::TestCase #:nodoc:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment