From 7ff77108035d9846192afe3030920a1c7d9b54d5 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 18 Jul 2017 15:26:33 +0200 Subject: [PATCH] =?UTF-8?q?A=20gestionnaire=20can=20only=20see=20proc?= =?UTF-8?q?=C3=A9dures=20publi=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/gestionnaire.rb | 2 +- .../backoffice/dossiers/procedure_controller_spec.rb | 2 +- spec/controllers/backoffice/dossiers_controller_spec.rb | 8 ++++---- .../new_gestionnaire/dossiers_controller_spec.rb | 6 +++--- .../new_gestionnaire/procedures_controller_spec.rb | 2 +- spec/controllers/root_controller_spec.rb | 2 +- spec/facades/dossiers_list_facades_spec.rb | 4 ++-- spec/factories/dossier.rb | 2 +- spec/features/backoffice/add_commentaire_spec.rb | 2 +- spec/features/backoffice/connection_spec.rb | 2 +- spec/features/backoffice/flux_de_commentaires_spec.rb | 2 +- spec/features/backoffice/index_show_procedure_spec.rb | 4 ++-- .../lateral_page_pref_list_dossier_backoffice_spec.rb | 2 +- ...page_pref_list_dossier_by_procedure_backoffice_spec.rb | 2 +- spec/features/backoffice/navigate_to_dossier_spec.rb | 4 ++-- spec/features/backoffice/search_file_spec.rb | 2 +- spec/models/gestionnaire_spec.rb | 6 +++--- spec/models/search_spec.rb | 4 ++-- spec/services/accompagnateur_service_spec.rb | 2 +- spec/views/backoffice/dossiers/index_html.haml_spec.rb | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index dccd0cff9..98588bc32 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -7,7 +7,7 @@ class Gestionnaire < ActiveRecord::Base has_one :preference_smart_listing_page, dependent: :destroy has_many :assign_to, dependent: :destroy - has_many :procedures, through: :assign_to + has_many :procedures, -> { publiees_ou_archivees }, through: :assign_to has_many :dossiers, -> { state_not_brouillon }, through: :procedures has_many :followed_dossiers, through: :follows, source: :dossier has_many :follows diff --git a/spec/controllers/backoffice/dossiers/procedure_controller_spec.rb b/spec/controllers/backoffice/dossiers/procedure_controller_spec.rb index 411e53121..6c1da0b3e 100644 --- a/spec/controllers/backoffice/dossiers/procedure_controller_spec.rb +++ b/spec/controllers/backoffice/dossiers/procedure_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Backoffice::Dossiers::ProcedureController, type: :controller do let(:gestionnaire) { create :gestionnaire } - let(:procedure) { create :procedure } + let(:procedure) { create :procedure, :published } let(:archived) { false } let(:dossier) { create :dossier, procedure: procedure, archived: archived, state: 'initiated'} diff --git a/spec/controllers/backoffice/dossiers_controller_spec.rb b/spec/controllers/backoffice/dossiers_controller_spec.rb index 569318b94..4b09e776e 100644 --- a/spec/controllers/backoffice/dossiers_controller_spec.rb +++ b/spec/controllers/backoffice/dossiers_controller_spec.rb @@ -4,8 +4,8 @@ describe Backoffice::DossiersController, type: :controller do before do @request.env['HTTP_REFERER'] = TPS::Application::URL end - let(:procedure) { create :procedure } - let(:procedure2) { create :procedure } + let(:procedure) { create :procedure, :published } + let(:procedure2) { create :procedure, :published } let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: :initiated) } let(:dossier2) { create(:dossier, :with_entreprise, procedure: procedure2, state: :initiated) } @@ -38,8 +38,8 @@ describe Backoffice::DossiersController, type: :controller do context 'when gestionnaire is assign to many proceudure' do before do - create :assign_to, procedure: create(:procedure), gestionnaire: gestionnaire - create :assign_to, procedure: create(:procedure), gestionnaire: gestionnaire + create :assign_to, procedure: create(:procedure, :published), gestionnaire: gestionnaire + create :assign_to, procedure: create(:procedure, :published), gestionnaire: gestionnaire end it { expect(gestionnaire.procedures.count).to eq 3 } diff --git a/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb b/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb index b8f9ea4cb..5ff72010d 100644 --- a/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb +++ b/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe NewGestionnaire::DossiersController, type: :controller do let(:gestionnaire) { create(:gestionnaire) } - let(:procedure) { create(:procedure, gestionnaires: [gestionnaire]) } + let(:procedure) { create(:procedure, :published, gestionnaires: [gestionnaire]) } let(:dossier) { create(:dossier, :replied, procedure: procedure) } describe 'attestation' do @@ -11,7 +11,7 @@ describe NewGestionnaire::DossiersController, type: :controller do context 'when a dossier has an attestation' do let(:fake_pdf) { double(read: 'pdf content') } let!(:dossier) { create(:dossier, :replied, attestation: Attestation.new, procedure: procedure) } - let!(:procedure) { create(:procedure, gestionnaires: [gestionnaire]) } + let!(:procedure) { create(:procedure, :published, gestionnaires: [gestionnaire]) } let!(:dossier) { create(:dossier, :replied, attestation: Attestation.new, procedure: procedure) } it 'returns the attestation pdf' do @@ -77,7 +77,7 @@ describe NewGestionnaire::DossiersController, type: :controller do end describe "#show" do - let(:procedure) { create(:procedure, gestionnaires: [gestionnaire]) } + let(:procedure) { create(:procedure, :published, gestionnaires: [gestionnaire]) } let(:dossier){ create(:dossier, :replied, procedure: procedure) } subject { get :show, params: { procedure_id: procedure.id, dossier_id: dossier.id } } diff --git a/spec/controllers/new_gestionnaire/procedures_controller_spec.rb b/spec/controllers/new_gestionnaire/procedures_controller_spec.rb index 1ba23a167..ac228d79f 100644 --- a/spec/controllers/new_gestionnaire/procedures_controller_spec.rb +++ b/spec/controllers/new_gestionnaire/procedures_controller_spec.rb @@ -68,7 +68,7 @@ describe NewGestionnaire::ProceduresController, type: :controller do subject end - it { expect(assigns(:procedures)).to include(procedure1, procedure2, procedure3) } + it { expect(assigns(:procedures)).to include(procedure1, procedure2) } end context "with dossiers" do diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb index 4ea5e837b..f39c348db 100644 --- a/spec/controllers/root_controller_spec.rb +++ b/spec/controllers/root_controller_spec.rb @@ -20,7 +20,7 @@ describe RootController, type: :controller do context 'when gestionnaire is affect to a procedure' do before do - create :assign_to, procedure: (create :procedure), gestionnaire: gestionnaire + create :assign_to, procedure: (create :procedure, :published), gestionnaire: gestionnaire end it { expect(subject).to redirect_to(backoffice_dossiers_procedure_path(id: Procedure.all.first.id)) } diff --git a/spec/facades/dossiers_list_facades_spec.rb b/spec/facades/dossiers_list_facades_spec.rb index 08ca0c878..98f19254f 100644 --- a/spec/facades/dossiers_list_facades_spec.rb +++ b/spec/facades/dossiers_list_facades_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe DossiersListFacades do let(:gestionnaire) { create :gestionnaire } - let(:procedure) { create :procedure, libelle: 'Ma procédure' } - let(:procedure_2) { create :procedure, libelle: 'Ma seconde procédure' } + let(:procedure) { create :procedure, :published, libelle: 'Ma procédure' } + let(:procedure_2) { create :procedure, :published, libelle: 'Ma seconde procédure' } let!(:preference) { create :preference_list_dossier, gestionnaire: gestionnaire, diff --git a/spec/factories/dossier.rb b/spec/factories/dossier.rb index 52c3ecc5b..62c6c6dc0 100644 --- a/spec/factories/dossier.rb +++ b/spec/factories/dossier.rb @@ -5,7 +5,7 @@ FactoryGirl.define do before(:create) do |dossier, _evaluator| unless dossier.procedure - procedure = create(:procedure, :with_two_type_de_piece_justificative, :with_type_de_champ, :with_type_de_champ_private) + procedure = create(:procedure, :published, :with_two_type_de_piece_justificative, :with_type_de_champ, :with_type_de_champ_private) dossier.procedure = procedure end end diff --git a/spec/features/backoffice/add_commentaire_spec.rb b/spec/features/backoffice/add_commentaire_spec.rb index 4a02c93c8..007966589 100644 --- a/spec/features/backoffice/add_commentaire_spec.rb +++ b/spec/features/backoffice/add_commentaire_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'add commentaire on backoffice' do - let(:procedure) { create(:procedure) } + let(:procedure) { create(:procedure, :published) } let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') } let(:dossier_id) { dossier.id } let!(:commentaire) { create(:commentaire, dossier: dossier, email: 'toto@toto.com') } diff --git a/spec/features/backoffice/connection_spec.rb b/spec/features/backoffice/connection_spec.rb index 10252b367..65a20af26 100644 --- a/spec/features/backoffice/connection_spec.rb +++ b/spec/features/backoffice/connection_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'when gestionnaire come to /backoffice and is not authenticated' do - let(:procedure) { create(:procedure) } + let(:procedure) { create(:procedure, :published) } let!(:dossier) { create(:dossier, procedure: procedure) } before do visit backoffice_path diff --git a/spec/features/backoffice/flux_de_commentaires_spec.rb b/spec/features/backoffice/flux_de_commentaires_spec.rb index f2eef84f0..87247e8ad 100644 --- a/spec/features/backoffice/flux_de_commentaires_spec.rb +++ b/spec/features/backoffice/flux_de_commentaires_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'backoffice: flux de commentaires' do - let(:procedure) { create(:procedure) } + let(:procedure) { create(:procedure, :published) } let(:gestionnaire) { create(:gestionnaire) } let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') } let(:dossier_id) { dossier.id } diff --git a/spec/features/backoffice/index_show_procedure_spec.rb b/spec/features/backoffice/index_show_procedure_spec.rb index ef0eade1a..fc6e60d47 100644 --- a/spec/features/backoffice/index_show_procedure_spec.rb +++ b/spec/features/backoffice/index_show_procedure_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' feature 'As an Accompagnateur I can navigate and use each functionnality around procedures and their dossiers' do let(:user) { create(:user) } let(:gestionnaire) { create(:gestionnaire) } - let(:procedure_1) { create(:procedure, :with_type_de_champ, libelle: 'procedure 1') } - let(:procedure_2) { create(:procedure, :with_type_de_champ, libelle: 'procedure 2') } + let(:procedure_1) { create(:procedure, :published, :with_type_de_champ, libelle: 'procedure 1') } + let(:procedure_2) { create(:procedure, :published, :with_type_de_champ, libelle: 'procedure 2') } before 'Assign procedures to Accompagnateur and generating dossiers for each' do create :assign_to, gestionnaire: gestionnaire, procedure: procedure_1 diff --git a/spec/features/backoffice/lateral_page_pref_list_dossier_backoffice_spec.rb b/spec/features/backoffice/lateral_page_pref_list_dossier_backoffice_spec.rb index 9e7ff7289..54168c166 100644 --- a/spec/features/backoffice/lateral_page_pref_list_dossier_backoffice_spec.rb +++ b/spec/features/backoffice/lateral_page_pref_list_dossier_backoffice_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' feature 'usage of pref list dossier lateral panel', js: true do let(:administrateur) { create(:administrateur) } let(:gestionnaire) { create(:gestionnaire, administrateurs: [administrateur]) } - let(:procedure) { create(:procedure, administrateur: administrateur) } + let(:procedure) { create(:procedure, :published, administrateur: administrateur) } before do create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') diff --git a/spec/features/backoffice/lateral_page_pref_list_dossier_by_procedure_backoffice_spec.rb b/spec/features/backoffice/lateral_page_pref_list_dossier_by_procedure_backoffice_spec.rb index 79dd816ac..9f4178f50 100644 --- a/spec/features/backoffice/lateral_page_pref_list_dossier_by_procedure_backoffice_spec.rb +++ b/spec/features/backoffice/lateral_page_pref_list_dossier_by_procedure_backoffice_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' feature 'usage of pref list dossier lateral panel by procedure', js: true do let(:administrateur) { create(:administrateur) } let(:gestionnaire) { create(:gestionnaire, administrateurs: [administrateur]) } - let(:procedure) { create(:procedure, :with_type_de_champ, administrateur: administrateur) } + let(:procedure) { create(:procedure, :published, :with_type_de_champ, administrateur: administrateur) } before do create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') diff --git a/spec/features/backoffice/navigate_to_dossier_spec.rb b/spec/features/backoffice/navigate_to_dossier_spec.rb index 8dcd90533..aa2750b6b 100644 --- a/spec/features/backoffice/navigate_to_dossier_spec.rb +++ b/spec/features/backoffice/navigate_to_dossier_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' feature 'on backoffice page', js: true do let(:administrateur) { create(:administrateur) } let(:gestionnaire) { create(:gestionnaire, administrateurs: [administrateur]) } - let(:procedure) { create(:procedure, administrateur: administrateur) } - let(:procedure_individual) { create :procedure, libelle: 'procedure individual', administrateur: administrateur, for_individual: true } + let(:procedure) { create(:procedure, :published, administrateur: administrateur) } + let(:procedure_individual) { create :procedure, :published, libelle: 'procedure individual', administrateur: administrateur, for_individual: true } let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') } let!(:dossier_individual) { create :dossier, procedure: procedure_individual, state: 'updated' } diff --git a/spec/features/backoffice/search_file_spec.rb b/spec/features/backoffice/search_file_spec.rb index 42ecf5655..d284671cd 100644 --- a/spec/features/backoffice/search_file_spec.rb +++ b/spec/features/backoffice/search_file_spec.rb @@ -11,7 +11,7 @@ feature 'search file on gestionnaire backoffice' do context 'when gestionnaire is logged in' do context 'when he click on search button' do let(:terms) { '' } - let!(:procedure) { create(:procedure, administrateur: administrateur) } + let!(:procedure) { create(:procedure, :published, administrateur: administrateur) } before do create :assign_to, gestionnaire: gestionnaire, procedure: procedure diff --git a/spec/models/gestionnaire_spec.rb b/spec/models/gestionnaire_spec.rb index 7bd13c5a3..319f2fa4d 100644 --- a/spec/models/gestionnaire_spec.rb +++ b/spec/models/gestionnaire_spec.rb @@ -2,9 +2,9 @@ require 'spec_helper' describe Gestionnaire, type: :model do let(:admin) { create :administrateur } - let!(:procedure) { create :procedure, administrateur: admin } - let!(:procedure_2) { create :procedure, administrateur: admin } - let!(:procedure_3) { create :procedure, administrateur: admin } + let!(:procedure) { create :procedure, :published, administrateur: admin } + let!(:procedure_2) { create :procedure, :published, administrateur: admin } + let!(:procedure_3) { create :procedure, :published, administrateur: admin } let(:gestionnaire) { create :gestionnaire, procedure_filter: procedure_filter, administrateurs: [admin] } let(:procedure_filter) { nil } let!(:procedure_assign) { create :assign_to, gestionnaire: gestionnaire, procedure: procedure } diff --git a/spec/models/search_spec.rb b/spec/models/search_spec.rb index ba760cdd6..dd46ea750 100644 --- a/spec/models/search_spec.rb +++ b/spec/models/search_spec.rb @@ -19,8 +19,8 @@ describe Search do create :assign_to, gestionnaire: gestionnaire_2, procedure: procedure_2 end - let(:procedure_1) { create(:procedure, administrateur: administrateur_1) } - let(:procedure_2) { create(:procedure, administrateur: administrateur_2) } + let(:procedure_1) { create(:procedure, :published, administrateur: administrateur_1) } + let(:procedure_2) { create(:procedure, :published, administrateur: administrateur_2) } let!(:dossier_0) { create(:dossier, state: 'draft', procedure: procedure_1, user: create(:user, email: 'brouillon@clap.fr')) } let!(:dossier_1) { create(:dossier, state: 'initiated', procedure: procedure_1, user: create(:user, email: 'contact@test.com')) } diff --git a/spec/services/accompagnateur_service_spec.rb b/spec/services/accompagnateur_service_spec.rb index ae6fbb016..e8a550949 100644 --- a/spec/services/accompagnateur_service_spec.rb +++ b/spec/services/accompagnateur_service_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe AccompagnateurService do - let(:procedure) { create :procedure } + let(:procedure) { create :procedure, :published } let(:accompagnateur) { create :gestionnaire } let(:accompagnateur_service) { AccompagnateurService.new accompagnateur, procedure, to} diff --git a/spec/views/backoffice/dossiers/index_html.haml_spec.rb b/spec/views/backoffice/dossiers/index_html.haml_spec.rb index 307fa0113..539e2c4f9 100644 --- a/spec/views/backoffice/dossiers/index_html.haml_spec.rb +++ b/spec/views/backoffice/dossiers/index_html.haml_spec.rb @@ -4,7 +4,7 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do let(:administrateur) { create(:administrateur) } let(:gestionnaire) { create(:gestionnaire, administrateurs: [administrateur]) } - let!(:procedure) { create(:procedure, administrateur: administrateur) } + let!(:procedure) { create(:procedure, :published, administrateur: administrateur) } let!(:decorate_dossier_initiated) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated').decorate } let!(:decorate_dossier_replied) { create(:dossier, :with_entreprise, procedure: procedure, state: 'replied').decorate }