Commit f79ec493 by Claudio Contin Committed by Jon Yurek

fix deprecations for rails 4

parent c7c52919
...@@ -103,7 +103,11 @@ module Paperclip ...@@ -103,7 +103,11 @@ module Paperclip
end end
end end
if defined?(ActionController::Integration::Session) if defined?(ActionDispatch::Integration::Session)
class ActionDispatch::IntegrationTest::Session #:nodoc:
include Paperclip::Shoulda
end
elsif defined?(ActionController::Integration::Session)
class ActionController::Integration::Session #:nodoc: class ActionController::Integration::Session #:nodoc:
include Paperclip::Shoulda include Paperclip::Shoulda
end end
...@@ -119,6 +123,13 @@ else ...@@ -119,6 +123,13 @@ else
end end
end end
class Test::Unit::TestCase #:nodoc: if defined?(Minitest)
extend Paperclip::Shoulda class Minitest::Unit::TestCase #:nodoc:
extend Paperclip::Shoulda
end
elsif defined?(Test)
class Test::Unit::TestCase #:nodoc:
extend Paperclip::Shoulda
end
end end
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