diff --git a/Gemfile b/Gemfile index d629ba148..6293849d7 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'groupdate' gem 'haml-rails' gem 'hashie' gem 'jquery-rails' # Use jquery as the JavaScript library -gem 'kaminari' # Pagination +gem 'kaminari', '= 1.1.1' # Pagination gem 'lograge' gem 'logstash-event' gem 'mailjet' diff --git a/Gemfile.lock b/Gemfile.lock index f15b8a2f4..da412fd65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -325,18 +325,18 @@ GEM bindata jsonapi-renderer (0.2.2) jwt (2.1.0) - kaminari (1.2.0) + kaminari (1.1.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.0) - kaminari-activerecord (= 1.2.0) - kaminari-core (= 1.2.0) - kaminari-actionview (1.2.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) actionview - kaminari-core (= 1.2.0) - kaminari-activerecord (1.2.0) + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) activerecord - kaminari-core (= 1.2.0) - kaminari-core (1.2.0) + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.7.0) @@ -384,7 +384,7 @@ GEM nenv (0.3.0) netrc (0.11.0) nio4r (2.5.2) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -766,7 +766,7 @@ DEPENDENCIES haml-rails hashie jquery-rails - kaminari + kaminari (= 1.1.1) launchy letter_opener_web lograge diff --git a/spec/controllers/manager/procedures_controller_spec.rb b/spec/controllers/manager/procedures_controller_spec.rb index b546a93e6..e6a839dc7 100644 --- a/spec/controllers/manager/procedures_controller_spec.rb +++ b/spec/controllers/manager/procedures_controller_spec.rb @@ -25,4 +25,20 @@ describe Manager::ProceduresController, type: :controller do it { expect(response.body).to include('sub type de champ') } end + + describe '#index' do + render_views + + let(:administration) { create(:administration) } + let!(:dossier) { create(:dossier) } + + context 'sort by dossiers' do + before do + sign_in(administration) + get :index, params: { procedure: { direction: 'asc', order: 'dossiers' } } + end + + it { expect(response.body).to include('1 dossier') } + end + end end