DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6044 from betagouv/bump_and_remove_mimemagic_deps

Browse source 
Maj de rails 6.3.1 et calcxls pour enlever mimemagic dep, maj skylight
This commit is contained in:
Pierre de La Morinerie 2021-04-01 15:12:47 +02:00 committed by GitHub
commit b0e38f366e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
Gemfile.lock
View file

@ -23,40 +23,40 @@ GEM
specs: specs:
aasm (5.1.1) aasm (5.1.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
actioncable (6.1.3) actioncable (6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.3) actionmailbox (6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
activejob (= 6.1.3) activejob (= 6.1.3.1)
activerecord (= 6.1.3) activerecord (= 6.1.3.1)
activestorage (= 6.1.3) activestorage (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.3) actionmailer (6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
actionview (= 6.1.3) actionview (= 6.1.3.1)
activejob (= 6.1.3) activejob (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.3) actionpack (6.1.3.1)
actionview (= 6.1.3) actionview (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.3) actiontext (6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
activerecord (= 6.1.3) activerecord (= 6.1.3.1)
activestorage (= 6.1.3) activestorage (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.3) actionview (6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -71,26 +71,26 @@ GEM
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
active_storage_validations (0.9.2) active_storage_validations (0.9.2)
rails (>= 5.2.0) rails (>= 5.2.0)
activejob (6.1.3) activejob (6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.3) activemodel (6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
activerecord (6.1.3) activerecord (6.1.3.1)
activemodel (= 6.1.3) activemodel (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
activestorage (6.1.3) activestorage (6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
activejob (= 6.1.3) activejob (= 6.1.3.1)
activerecord (= 6.1.3) activerecord (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
marcel (~> 0.3.1) marcel (~> 1.0.0)
mimemagic (~> 0.3.2) mini_mime (~> 1.0.2)
activestorage-openstack (1.5.1) activestorage-openstack (1.5.1)
fog-openstack (~> 1.0) fog-openstack (~> 1.0)
marcel marcel
rails (>= 5.2.2) rails (>= 5.2.2)
activesupport (6.1.3) activesupport (6.1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -163,9 +163,9 @@ GEM
selenium-webdriver selenium-webdriver
case_transform (0.2) case_transform (0.2)
activesupport activesupport
caxlsx (3.0.4) caxlsx (3.1.0)
htmlentities (~> 4.3, >= 4.3.4) htmlentities (~> 4.3, >= 4.3.4)
mimemagic (~> 0.3) marcel (~> 1.0)
nokogiri (~> 1.10, >= 1.10.4) nokogiri (~> 1.10, >= 1.10.4)
rubyzip (>= 1.3.0, < 3) rubyzip (>= 1.3.0, < 3)
chartkick (3.4.2) chartkick (3.4.2)
@ -340,7 +340,7 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http_accept_language (2.1.1) http_accept_language (2.1.1)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.9) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n-tasks (0.9.33) i18n-tasks (0.9.33)
activesupport (>= 4.0.2) activesupport (>= 4.0.2)
@ -412,17 +412,13 @@ GEM
activesupport (>= 3.1.0) activesupport (>= 3.1.0)
rack (>= 1.4.0) rack (>= 1.4.0)
rest-client (>= 2.0.0) rest-client (>= 2.0.0)
marcel (0.3.3) marcel (1.0.0)
mimemagic (~> 0.3.2)
method_source (1.0.0) method_source (1.0.0)
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0212) mime-types-data (3.2021.0212)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_magick (4.11.0) mini_magick (4.11.0)
mini_mime (1.0.2) mini_mime (1.0.3)
mini_portile2 (2.5.0) mini_portile2 (2.5.0)
minitest (5.14.4) minitest (5.14.4)
momentjs-rails (2.20.1) momentjs-rails (2.20.1)
@ -433,8 +429,8 @@ GEM
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.5) nio4r (2.5.7)
nokogiri (1.11.1) nokogiri (1.11.2)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
open4 (1.3.4) open4 (1.3.4)
@ -505,20 +501,20 @@ GEM
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.1.3) rails (6.1.3.1)
actioncable (= 6.1.3) actioncable (= 6.1.3.1)
actionmailbox (= 6.1.3) actionmailbox (= 6.1.3.1)
actionmailer (= 6.1.3) actionmailer (= 6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
actiontext (= 6.1.3) actiontext (= 6.1.3.1)
actionview (= 6.1.3) actionview (= 6.1.3.1)
activejob (= 6.1.3) activejob (= 6.1.3.1)
activemodel (= 6.1.3) activemodel (= 6.1.3.1)
activerecord (= 6.1.3) activerecord (= 6.1.3.1)
activestorage (= 6.1.3) activestorage (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.3) railties (= 6.1.3.1)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
@ -537,9 +533,9 @@ GEM
rails-i18n (6.0.0) rails-i18n (6.0.0)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7) railties (>= 6.0.0, < 7)
railties (6.1.3) railties (6.1.3.1)
actionpack (= 6.1.3) actionpack (= 6.1.3.1)
activesupport (= 6.1.3) activesupport (= 6.1.3.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 1.0) thor (~> 1.0)
@ -683,10 +679,8 @@ GEM
rack (~> 2.2) rack (~> 2.2)
rack-protection (= 2.1.0) rack-protection (= 2.1.0)
tilt (~> 2.0) tilt (~> 2.0)
skylight (4.3.2) skylight (5.0.1)
skylight-core (= 4.3.2) activesupport (>= 5.2.0)
skylight-core (4.3.2)
activesupport (>= 4.2.0)
smart_listing (1.2.3) smart_listing (1.2.3)
coffee-rails coffee-rails
jquery-rails jquery-rails

6
spec/controllers/application_controller_spec.rb
View file

@ -41,8 +41,6 @@ describe ApplicationController, type: :controller do
payload.delete(key) payload.delete(key)
end end
expect(payload).to eq({ expect(payload).to eq({
sk_rendered_format: :text,
sk_variant: [],
user_agent: 'Rails Testing', user_agent: 'Rails Testing',
user_roles: 'Guest' user_roles: 'Guest'
}) })
@ -62,8 +60,6 @@ describe ApplicationController, type: :controller do
payload.delete(key) payload.delete(key)
end end
expect(payload).to eq({ expect(payload).to eq({
sk_rendered_format: :text,
sk_variant: [],
user_agent: 'Rails Testing', user_agent: 'Rails Testing',
user_id: current_user.id, user_id: current_user.id,
user_email: current_user.email, user_email: current_user.email,
@ -88,8 +84,6 @@ describe ApplicationController, type: :controller do
payload.delete(key) payload.delete(key)
end end
expect(payload).to eq({ expect(payload).to eq({
sk_rendered_format: :text,
sk_variant: [],
user_agent: 'Rails Testing', user_agent: 'Rails Testing',
user_id: current_user.id, user_id: current_user.id,
user_email: current_user.email, user_email: current_user.email,

2
spec/controllers/manager/application_controller_spec.rb
View file

@ -14,8 +14,6 @@ describe Manager::ApplicationController, type: :controller do
payload.delete(key) payload.delete(key)
end end
expect(payload).to eq({ expect(payload).to eq({
sk_rendered_format: :text,
sk_variant: [],
user_agent: 'Rails Testing', user_agent: 'Rails Testing',
user_id: current_user.id, user_id: current_user.id,
user_email: current_user.email user_email: current_user.email