Skip to content
Snippets Groups Projects
Unverified Commit 2276fea2 authored by Bruno Michel's avatar Bruno Michel Committed by GitHub
Browse files

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
parent 50246202
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ source 'https://rubygems.org' ...@@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem "amazing_print" gem "amazing_print"
gem "faker" gem "faker"
gem "faye-websocket" gem "faye-websocket"
gem "mimemagic" gem "mini_mime"
gem "minitest" gem "minitest"
gem "pbkdf2-ruby" gem "pbkdf2-ruby"
gem "pry" gem "pry"
......
...@@ -27,7 +27,7 @@ GEM ...@@ -27,7 +27,7 @@ GEM
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009) mime-types-data (3.2019.1009)
mimemagic (0.3.2) mini_mime (1.0.3)
minitest (5.11.3) minitest (5.11.3)
netrc (0.11.0) netrc (0.11.0)
pbkdf2-ruby (0.2.1) pbkdf2-ruby (0.2.1)
...@@ -62,7 +62,7 @@ DEPENDENCIES ...@@ -62,7 +62,7 @@ DEPENDENCIES
amazing_print amazing_print
faker faker
faye-websocket faye-websocket
mimemagic mini_mime
minitest minitest
pbkdf2-ruby pbkdf2-ruby
pry pry
......
...@@ -4,7 +4,7 @@ require 'date' ...@@ -4,7 +4,7 @@ require 'date'
require 'digest' require 'digest'
require 'faker' require 'faker'
require 'fileutils' require 'fileutils'
require 'mimemagic' require 'mini_mime'
require 'json' require 'json'
require 'open3' require 'open3'
require 'pbkdf2' require 'pbkdf2'
......
...@@ -6,4 +6,4 @@ at_exit { Helpers.cleanup } ...@@ -6,4 +6,4 @@ at_exit { Helpers.cleanup }
Helpers.scenario "interactive" Helpers.scenario "interactive"
Helpers.start_mailhog Helpers.start_mailhog
Pry.start binding, prompt: Pry::SIMPLE_PROMPT, quiet: true Pry.start binding, quiet: true
...@@ -55,7 +55,7 @@ class CozyFile ...@@ -55,7 +55,7 @@ class CozyFile
opts = opts.dup opts = opts.dup
opts[:content] = File.read filename opts[:content] = File.read filename
opts[:name] ||= "#{Faker::Internet.slug}#{File.extname(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 opts
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment