From 2276fea2bc91fd9eb28c6bacdacf8cde9e3c637d Mon Sep 17 00:00:00 2001
From: Bruno Michel <bmichel@menfin.info>
Date: Fri, 26 Mar 2021 09:32:48 +0100
Subject: [PATCH] Fix integration tests (#2964)
We were using the mimemagic ruby gem for our integration tests, but all
published versions of it were yanked for a license issue. So, let's move
to mini_mime.
See https://github.com/rails/rails/issues/41750
---
tests/integration/Gemfile | 2 +-
tests/integration/Gemfile.lock | 4 ++--
tests/integration/boot.rb | 2 +-
tests/integration/console.rb | 2 +-
tests/integration/lib/cozy_file.rb | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/integration/Gemfile b/tests/integration/Gemfile
index ba876ef17..3b6412a23 100644
--- a/tests/integration/Gemfile
+++ b/tests/integration/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem "amazing_print"
gem "faker"
gem "faye-websocket"
-gem "mimemagic"
+gem "mini_mime"
gem "minitest"
gem "pbkdf2-ruby"
gem "pry"
diff --git a/tests/integration/Gemfile.lock b/tests/integration/Gemfile.lock
index 9e94da0d2..92a28fe07 100644
--- a/tests/integration/Gemfile.lock
+++ b/tests/integration/Gemfile.lock
@@ -27,7 +27,7 @@ GEM
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
- mimemagic (0.3.2)
+ mini_mime (1.0.3)
minitest (5.11.3)
netrc (0.11.0)
pbkdf2-ruby (0.2.1)
@@ -62,7 +62,7 @@ DEPENDENCIES
amazing_print
faker
faye-websocket
- mimemagic
+ mini_mime
minitest
pbkdf2-ruby
pry
diff --git a/tests/integration/boot.rb b/tests/integration/boot.rb
index f2113c7eb..1d309f427 100644
--- a/tests/integration/boot.rb
+++ b/tests/integration/boot.rb
@@ -4,7 +4,7 @@ require 'date'
require 'digest'
require 'faker'
require 'fileutils'
-require 'mimemagic'
+require 'mini_mime'
require 'json'
require 'open3'
require 'pbkdf2'
diff --git a/tests/integration/console.rb b/tests/integration/console.rb
index cb314873a..14a0236df 100755
--- a/tests/integration/console.rb
+++ b/tests/integration/console.rb
@@ -6,4 +6,4 @@ at_exit { Helpers.cleanup }
Helpers.scenario "interactive"
Helpers.start_mailhog
-Pry.start binding, prompt: Pry::SIMPLE_PROMPT, quiet: true
+Pry.start binding, quiet: true
diff --git a/tests/integration/lib/cozy_file.rb b/tests/integration/lib/cozy_file.rb
index a55e881d9..57f2c554c 100644
--- a/tests/integration/lib/cozy_file.rb
+++ b/tests/integration/lib/cozy_file.rb
@@ -55,7 +55,7 @@ class CozyFile
opts = opts.dup
opts[:content] = File.read filename
opts[:name] ||= "#{Faker::Internet.slug}#{File.extname(filename)}"
- opts[:mime] ||= MimeMagic.by_path(filename).type
+ opts[:mime] ||= MiniMime.lookup_by_filename(filename).content_type
opts
end
--
GitLab