fix deprecations for rails 4

erkki · Jan 3, 2014 · f79ec49 · f79ec49
1 parent c7c5291
commit f79ec49
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/shoulda_macros/paperclip.rb b/shoulda_macros/paperclip.rb
@@ -103,7 +103,11 @@ def paperclip_fixture(model, attachment, extension)
   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 @@ class Factory
   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
+