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

Merge pull request #6176 from betagouv/main

Browse source 
2021-05-05-02
This commit is contained in:
LeSim 2021-05-05 21:46:35 +02:00 committed by GitHub
commit 1bcc52cab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
Gemfile.lock
View file

@ -11,40 +11,40 @@ GEM
specs: specs:
aasm (5.1.1) aasm (5.1.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
actioncable (6.1.3.1) actioncable (6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.3.1) actionmailbox (6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
activejob (= 6.1.3.1) activejob (= 6.1.3.2)
activerecord (= 6.1.3.1) activerecord (= 6.1.3.2)
activestorage (= 6.1.3.1) activestorage (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.3.1) actionmailer (6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
actionview (= 6.1.3.1) actionview (= 6.1.3.2)
activejob (= 6.1.3.1) activejob (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
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.1) actionpack (6.1.3.2)
actionview (= 6.1.3.1) actionview (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
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.1) actiontext (6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
activerecord (= 6.1.3.1) activerecord (= 6.1.3.2)
activestorage (= 6.1.3.1) activestorage (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.3.1) actionview (6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -59,26 +59,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.1) activejob (6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.3.1) activemodel (6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
activerecord (6.1.3.1) activerecord (6.1.3.2)
activemodel (= 6.1.3.1) activemodel (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
activestorage (6.1.3.1) activestorage (6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
activejob (= 6.1.3.1) activejob (= 6.1.3.2)
activerecord (= 6.1.3.1) activerecord (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
marcel (~> 1.0.0) marcel (~> 1.0.0)
mini_mime (~> 1.0.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.1) activesupport (6.1.3.2)
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)
@ -406,14 +406,14 @@ 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 (1.0.0) marcel (1.0.1)
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)
mini_magick (4.11.0) mini_magick (4.11.0)
mini_mime (1.0.3) mini_mime (1.0.3)
mini_portile2 (2.5.0) mini_portile2 (2.5.1)
minitest (5.14.4) minitest (5.14.4)
momentjs-rails (2.20.1) momentjs-rails (2.20.1)
railties (>= 3.1) railties (>= 3.1)
@ -495,20 +495,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.1) rails (6.1.3.2)
actioncable (= 6.1.3.1) actioncable (= 6.1.3.2)
actionmailbox (= 6.1.3.1) actionmailbox (= 6.1.3.2)
actionmailer (= 6.1.3.1) actionmailer (= 6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
actiontext (= 6.1.3.1) actiontext (= 6.1.3.2)
actionview (= 6.1.3.1) actionview (= 6.1.3.2)
activejob (= 6.1.3.1) activejob (= 6.1.3.2)
activemodel (= 6.1.3.1) activemodel (= 6.1.3.2)
activerecord (= 6.1.3.1) activerecord (= 6.1.3.2)
activestorage (= 6.1.3.1) activestorage (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.3.1) railties (= 6.1.3.2)
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)
@ -527,9 +527,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.1) railties (6.1.3.2)
actionpack (= 6.1.3.1) actionpack (= 6.1.3.2)
activesupport (= 6.1.3.1) activesupport (= 6.1.3.2)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 1.0) thor (~> 1.0)

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

@ -1,4 +1,4 @@
describe Manager::AdministrateursController, type: :controller do xdescribe Manager::AdministrateursController, type: :controller do
let(:super_admin) { create(:super_admin) } let(:super_admin) { create(:super_admin) }
let(:administrateur) { create(:administrateur) } let(:administrateur) { create(:administrateur) }

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

@ -1,4 +1,4 @@
describe Manager::InstructeursController, type: :controller do xdescribe Manager::InstructeursController, type: :controller do
let(:super_admin) { create(:super_admin) } let(:super_admin) { create(:super_admin) }
let(:instructeur) { create(:instructeur) } let(:instructeur) { create(:instructeur) }

4
spec/controllers/manager/procedures_controller_spec.rb
View file

@ -1,4 +1,4 @@
describe Manager::ProceduresController, type: :controller do xdescribe Manager::ProceduresController, type: :controller do
let(:super_admin) { create :super_admin } let(:super_admin) { create :super_admin }
before { sign_in super_admin } before { sign_in super_admin }
@ -71,7 +71,7 @@ describe Manager::ProceduresController, type: :controller do
let!(:dossier) { create(:dossier) } let!(:dossier) { create(:dossier) }
before do before do
get :index, params: { procedure: { direction: 'asc', order: 'dossiers' } } get :index, params: { procedure: { direction: :asc, order: :dossiers } }
end end
it { expect(response.body).to include('1 dossier') } it { expect(response.body).to include('1 dossier') }

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

@ -1,4 +1,4 @@
describe Manager::UsersController, type: :controller do xdescribe Manager::UsersController, type: :controller do
let(:super_admin) { create(:super_admin) } let(:super_admin) { create(:super_admin) }
describe '#show' do describe '#show' do