replace mocha and bourne with rspec mocks (kreeti#6)

* initial work on replacing mocha with rspec-mocks

* replacing stubs with allow

* fix validators tests and warnings

* fix attachment_processing_spec.rb

* fixes paperclip/interpolation_spec.rb

* stubs and related methods fixes

* argument fixes related in 'with'

* using double instead of stub

* s3 and fog fixes

* yield multiple times

* has_attached_file spec fixes

* s3_spec fixes

* adding libjpeg to allow support for jpeg images

* imagemagick installation

* updating packages before installation

* removing policy.xml to allow pdf images to be read/written

* replacing ghostscript-9.20 by ghostscript

* removing unnecessary lines

* removing unnecessary lines from travis.yml

* updating syntax in fog_spec

.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: false
 
 rvm:
   - 2.1
@@ -11,9 +10,13 @@ script: "bundle exec rake clean spec cucumber"
 
 addons:
   apt:
+    update: true
     packages:
     - ghostscript
 
+before_install:
+  - sudo rm /etc/ImageMagick-6/policy.xml
+
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile

lib/paperclip/media_type_spoof_detector.rb

@@ -48,7 +48,6 @@ def mapping_override_mismatch?
       !Array(mapped_content_type).include?(calculated_content_type)
     end
 
-
     def supplied_content_type
       @content_type
     end

paperclip.gemspec

@@ -34,9 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('shoulda')
   s.add_development_dependency('rspec', '~> 3.0')
   s.add_development_dependency('appraisal')
-  s.add_development_dependency('mocha')
   s.add_development_dependency('aws-sdk-s3')
-  s.add_development_dependency('bourne')
   s.add_development_dependency('cucumber-rails')
   s.add_development_dependency('cucumber-expressions', '4.0.3') # TODO: investigate failures on 4.0.4
   s.add_development_dependency('aruba', '~> 0.9.0')

spec/paperclip/attachment_processing_spec.rb

@@ -9,7 +9,7 @@
       Dummy.validates_attachment_content_type :avatar, content_type: "image/png"
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles)
+      expect(attachment).to receive(:post_process_styles)
 
       attachment.assign(file)
     end
@@ -19,7 +19,7 @@
       Dummy.validates_attachment_content_type :avatar, not: "image/png"
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles).never
+      expect(attachment).not_to receive(:post_process_styles)
 
       attachment.assign(file)
     end
@@ -29,7 +29,7 @@
       Dummy.validates_attachment_content_type :avatar, content_type: "image/tiff"
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles).never
+      expect(attachment).not_to receive(:post_process_styles)
 
       attachment.assign(file)
     end
@@ -39,7 +39,7 @@
       Dummy.validates_attachment_content_type :avatar, content_type: "image/tiff", if: lambda{false}
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles)
+      expect(attachment).to receive(:post_process_styles)
 
       attachment.assign(invalid_assignment)
     end
@@ -51,7 +51,7 @@
       Dummy.validates_attachment :avatar, content_type: {content_type: "image/png"}
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles)
+      expect(attachment).to receive(:post_process_styles)
 
       attachment.assign(file)
     end
@@ -61,7 +61,7 @@
       Dummy.validates_attachment :avatar, content_type: {not: "image/png"}
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles).never
+      expect(attachment).not_to receive(:post_process_styles)
 
       attachment.assign(file)
     end
@@ -71,7 +71,7 @@
       Dummy.validates_attachment :avatar, content_type: {content_type: "image/tiff"}
       instance = Dummy.new
       attachment = instance.avatar
-      attachment.expects(:post_process_styles).never
+      expect(attachment).not_to receive(:post_process_styles)
 
       attachment.assign(file)
     end