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

instucteurs: don't show discarded procedures in the list

Browse source
This commit is contained in:
Pierre de La Morinerie 2020-04-22 15:16:21 +02:00
parent 15645e11e3
commit f29ec5c775
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/instructeurs/procedures_controller.rb
View file

@ -8,6 +8,7 @@ module Instructeurs
def index def index
@procedures = current_instructeur @procedures = current_instructeur
.procedures .procedures
.kept
.with_attached_logo .with_attached_logo
.includes(:defaut_groupe_instructeur) .includes(:defaut_groupe_instructeur)
.order(closed_at: :desc, unpublished_at: :desc, published_at: :desc, created_at: :desc) .order(closed_at: :desc, unpublished_at: :desc, published_at: :desc, created_at: :desc)

6
spec/controllers/instructeurs/procedures_controller_spec.rb
View file

@ -99,10 +99,12 @@ describe Instructeurs::ProceduresController, type: :controller do
let(:procedure_draft) { create(:procedure) } let(:procedure_draft) { create(:procedure) }
let(:procedure_published) { create(:procedure, :published) } let(:procedure_published) { create(:procedure, :published) }
let(:procedure_closed) { create(:procedure, :closed) } let(:procedure_closed) { create(:procedure, :closed) }
let(:procedure_draft_discarded) { create(:procedure, :discarded) }
let(:procedure_closed_discarded) { create(:procedure, :discarded) }
let(:procedure_not_assigned) { create(:procedure) } let(:procedure_not_assigned) { create(:procedure) }
before do before do
[procedure_draft, procedure_published, procedure_closed].each do |p| [procedure_draft, procedure_published, procedure_closed, procedure_draft_discarded, procedure_closed_discarded].each do |p|
instructeur.groupe_instructeurs << p.defaut_groupe_instructeur instructeur.groupe_instructeurs << p.defaut_groupe_instructeur
end end
subject subject
@ -110,7 +112,7 @@ describe Instructeurs::ProceduresController, type: :controller do
it 'assigns procedures visible to the instructeur' do it 'assigns procedures visible to the instructeur' do
expect(assigns(:procedures)).to include(procedure_draft, procedure_published, procedure_closed) expect(assigns(:procedures)).to include(procedure_draft, procedure_published, procedure_closed)
expect(assigns(:procedures)).not_to include(procedure_not_assigned) expect(assigns(:procedures)).not_to include(procedure_draft_discarded, procedure_closed_discarded, procedure_not_assigned)
end end
end end