Skip to content

P
paperclip
Commit f79ec493 by Claudio Contin Committed by Jon Yurek
Options

fix deprecations for rails 4

parent c7c52919
Showing with 14 additions and 3 deletions
shoulda_macros/paperclip.rb
......@@ -103,7 +103,11 @@ module Paperclip
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:
include Paperclip::Shoulda
end
......@@ -119,6 +123,13 @@ else
end
end
class Test::Unit::TestCase #:nodoc:
extend Paperclip::Shoulda
if defined?(Minitest)
class Minitest::Unit::TestCase #:nodoc:
extend Paperclip::Shoulda
end
elsif defined?(Test)
class Test::Unit::TestCase #:nodoc:
extend Paperclip::Shoulda
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