Fix specs breaking with MiniMagick 5.x

Author: mshibuya

carrierwave.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fog-aws"
   s.add_development_dependency "fog-google", ["~> 1.7", "!= 1.12.1"]
   s.add_development_dependency "fog-local"
-  s.add_development_dependency "mini_magick", ">= 3.6.0"
+  s.add_development_dependency "mini_magick"
 
   if RUBY_ENGINE != 'jruby'
     s.add_development_dependency "rmagick", ">= 2.16"

gemfiles/rails-6-0.gemfile

@@ -6,5 +6,6 @@ gem "sqlite3", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
 gem "fog-google", "~> 1.13.0" if RUBY_VERSION < '2.7'
 gem "fog-rackspace"
+gem "mini_magick", "~> 4.13"
 
 gemspec :path => "../"

spec/processing/mini_magick_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'open3'
 
 describe CarrierWave::MiniMagick do
   let(:klass) { Class.new(CarrierWave::Uploader::Base) { include CarrierWave::MiniMagick } }
@@ -270,8 +271,7 @@
 
     context "of failing to find ImageMagick/GraphicsMagick" do
       before do
-        MiniMagick.remove_instance_variable(:@processor) if MiniMagick.instance_variable_defined?(:@processor)
-        MiniMagick.remove_instance_variable(:@cli) if MiniMagick.instance_variable_defined?(:@cli)
+        allow(MiniMagick).to receive(:cli_prefix).and_return('invalid')
         allow(MiniMagick::Utilities).to receive(:which).and_return(nil)
       end
 
@@ -283,6 +283,7 @@
     context "of being configured to use ImageMagick but failing to execute" do
       before do
         allow(MiniMagick).to receive(:processor).and_return(:magick)
+        allow(Open3).to receive(:capture3).and_raise(Errno::ENOENT)
         allow_any_instance_of(MiniMagick::Shell).to receive(:execute_open3).and_raise(Errno::ENOENT)
       end
 
@@ -293,6 +294,11 @@
   end
 
   describe "#manipulate!" do
+    let(:minimagick_error) do
+      # MiniMagick >= 5.0 does not call #validate! on Image.create, hence the error changes
+      MiniMagick::VERSION::MAJOR >= 5 ? MiniMagick::Error : MiniMagick::Invalid
+    end
+
     it "performs manipulation using the given block" do
       instance.manipulate! do |image|
         image.format('png')
@@ -310,8 +316,7 @@
 
     context "on failing to find ImageMagick/GraphicsMagick" do
       before do
-        MiniMagick.remove_instance_variable(:@processor) if MiniMagick.instance_variable_defined?(:@processor)
-        MiniMagick.remove_instance_variable(:@cli) if MiniMagick.instance_variable_defined?(:@cli)
+        allow(MiniMagick).to receive(:cli_prefix).and_return('invalid')
         allow(MiniMagick::Utilities).to receive(:which).and_return(nil)
       end
 
@@ -320,23 +325,24 @@
           instance.manipulate! do |image|
             image.format('png')
           end
-        end.to raise_exception(MiniMagick::Invalid)
+        end.to raise_exception(minimagick_error)
       end
     end
 
     context "on being configured to use ImageMagick but failing to execute" do
       before do
         allow(MiniMagick).to receive(:processor).and_return(:magick)
+        allow(Open3).to receive(:capture3).and_raise(Errno::ENOENT)
         allow_any_instance_of(MiniMagick::Shell).to receive(:execute_open3).and_raise(Errno::ENOENT)
       end
-      after { MiniMagick.remove_instance_variable(:@processor) }
+      after { MiniMagick.remove_instance_variable(:@processor) if MiniMagick.instance_variable_defined?(:@processor) }
 
       it "raises MiniMagick::Invalid" do
         expect do
           instance.manipulate! do |image|
             image.format('png')
           end
-        end.to raise_exception(MiniMagick::Invalid)
+        end.to raise_exception(minimagick_error)
       end
     end
   end