Spec: sign_in with administrateur.user

app/controllers/users/passwords_controller.rb

@@ -59,7 +59,7 @@ class Users::PasswordsController < Devise::PasswordsController
       administrateur = Administrateur.find_by(email: current_user.email)
 
       if administrateur
-        sign_in administrateur
+        sign_in(administrateur.user)
       end
     end
   end

spec/controllers/admin/assigns_controller_spec.rb

@@ -6,7 +6,7 @@ describe Admin::AssignsController, type: :controller do
   let(:instructeur) { create :instructeur, administrateurs: [admin] }
 
   before do
-    sign_in admin
+    sign_in(admin.user)
   end
 
   describe 'GET #show' do

spec/controllers/admin/attestation_templates_controller_spec.rb

@@ -11,7 +11,7 @@ describe Admin::AttestationTemplatesController, type: :controller do
   let(:uninterlaced_logo) { fixture_file_upload('spec/fixtures/files/uninterlaced-black.png', 'image/png') }
 
   before do
-    sign_in admin
+    sign_in(admin.user)
     Timecop.freeze(Time.zone.now)
   end
 

spec/controllers/admin/instructeurs_controller_spec.rb

@@ -6,7 +6,7 @@ describe Admin::InstructeursController, type: :controller do
   let(:admin_2) { create :administrateur, email: email_2 }
 
   before do
-    sign_in admin
+    sign_in(admin.user)
   end
 
   describe 'GET #index' do
@@ -117,8 +117,8 @@ describe Admin::InstructeursController, type: :controller do
       before do
         create :instructeur, email: email, administrateurs: [admin]
 
-        sign_out admin
-        sign_in admin_2
+        sign_out(admin.user)
+        sign_in(admin_2.user)
 
         subject
       end
@@ -138,8 +138,8 @@ describe Admin::InstructeursController, type: :controller do
       before do
         create :instructeur, email: email, administrateurs: [admin]
 
-        sign_out admin
-        sign_in admin_2
+        sign_out(admin.user)
+        sign_in(admin_2.user)
 
         subject
       end

spec/controllers/admin/mail_templates_controller_spec.rb

@@ -5,7 +5,7 @@ describe Admin::MailTemplatesController, type: :controller do
   let(:initiated_mail) { Mails::InitiatedMail.default_for_procedure(procedure) }
 
   before do
-    sign_in procedure.administrateurs.first
+    sign_in(procedure.administrateurs.first.user)
   end
 
   describe 'GET index' do

spec/controllers/admin/procedures_controller_spec.rb

@@ -33,7 +33,7 @@ describe Admin::ProceduresController, type: :controller do
   }
 
   before do
-    sign_in admin
+    sign_in(admin.user)
   end
 
   describe 'GET #index' do
@@ -155,7 +155,7 @@ describe Admin::ProceduresController, type: :controller do
 
     context 'when user is not connected' do
       before do
-        sign_out admin
+        sign_out(admin.user)
       end
 
       it { is_expected.to redirect_to new_user_session_path }
@@ -252,7 +252,7 @@ describe Admin::ProceduresController, type: :controller do
 
     context 'when administrateur is not connected' do
       before do
-        sign_out admin
+        sign_out(admin.user)
       end
 
       subject { put :update, params: { id: procedure.id } }
@@ -411,8 +411,8 @@ describe Admin::ProceduresController, type: :controller do
       let(:admin_2) { create(:administrateur) }
 
       before do
-        sign_out admin
-        sign_in admin_2
+        sign_out(admin.user)
+        sign_in(admin_2.user)
 
         put :publish, params: { procedure_id: procedure.id, path: 'fake_path' }
         procedure.reload
@@ -471,8 +471,8 @@ describe Admin::ProceduresController, type: :controller do
       let(:admin_2) { create(:administrateur) }
 
       before do
-        sign_out admin
-        sign_in admin_2
+        sign_out(admin.user)
+        sign_in(admin_2.user)
 
         put :archive, params: { procedure_id: procedure.id }
         procedure.reload
@@ -517,8 +517,8 @@ describe Admin::ProceduresController, type: :controller do
       let(:admin_2) { create(:administrateur) }
 
       before do
-        sign_out admin
-        sign_in admin_2
+        sign_out(admin.user)
+        sign_in(admin_2.user)
         subject
       end
 
@@ -783,7 +783,7 @@ describe Admin::ProceduresController, type: :controller do
 
     context 'when administrateur is not connected' do
       before do
-        sign_out admin
+        sign_out(admin.user)
       end
 
       subject { patch :update_monavis, params: { procedure_id: procedure.id } }

spec/controllers/new_administrateur/mail_templates_controller_spec.rb

@@ -7,7 +7,7 @@ describe NewAdministrateur::MailTemplatesController, type: :controller do
     let(:procedure) { create(:procedure, :with_logo, :with_service, administrateur: admin) }
 
     before do
-      sign_in admin
+      sign_in(admin.user)
       get :preview, params: { id: "initiated_mail", procedure_id: procedure.id }
     end
 

spec/controllers/new_administrateur/procedures_controller_spec.rb

@@ -5,7 +5,7 @@ describe NewAdministrateur::ProceduresController, type: :controller do
     let(:procedure) { create(:procedure) }
 
     before do
-      sign_in admin
+      sign_in(admin.user)
       get :apercu, params: { id: procedure.id }
     end
 

spec/controllers/new_administrateur/services_controller_spec.rb

@@ -4,7 +4,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
 
   describe '#create' do
     before do
-      sign_in admin
+      sign_in(admin.user)
       post :create, params: params
     end
 
@@ -52,7 +52,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
     let(:service_params) { { nom: 'nom', type_organisme: Service.type_organismes.fetch(:association) } }
 
     before do
-      sign_in admin
+      sign_in(admin.user)
       params = {
         id: service.id,
         service: service_params,
@@ -82,7 +82,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
     let!(:service) { create(:service, administrateur: admin) }
 
     def post_add_to_procedure
-      sign_in admin
+      sign_in(admin.user)
       params = {
         procedure: {
           id: procedure.id,
@@ -114,7 +114,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
 
     context 'when a service has no related procedure' do
       before do
-        sign_in admin
+        sign_in(admin.user)
         delete :destroy, params: { id: service.id, procedure_id: 12 }
       end
 
@@ -128,7 +128,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
       let!(:procedure) { create(:procedure, service: service) }
 
       before do
-        sign_in admin
+        sign_in(admin.user)
         delete :destroy, params: { id: service.id, procedure_id: 12 }
       end
 

spec/controllers/new_administrateur/types_de_champ_controller_spec.rb

@@ -6,7 +6,7 @@ describe NewAdministrateur::TypesDeChampController, type: :controller do
 
     before do
       admin.procedures << procedure
-      sign_in admin
+      sign_in(admin.user)
     end
 
     let(:type_champ) { TypeDeChamp.type_champs.fetch(:text) }

spec/controllers/root_controller_spec.rb

@@ -26,7 +26,7 @@ describe RootController, type: :controller do
 
   context 'when Administrateur is connected' do
     before do
-      sign_in create(:administrateur)
+      sign_in(create(:administrateur).user)
     end
 
     it { expect(subject).to redirect_to(admin_procedures_path) }

spec/controllers/users/profil_controller_spec.rb

@@ -10,7 +10,7 @@ describe Users::ProfilController, type: :controller do
   describe 'POST #renew_api_token' do
     let(:administrateur) { create(:administrateur) }
 
-    before { sign_in(administrateur) }
+    before { sign_in(administrateur.user) }
 
     before do
       allow(administrateur).to receive(:renew_api_token)

spec/controllers/users/sessions_controller_spec.rb

@@ -114,7 +114,7 @@ describe Users::SessionsController, type: :controller do
 
       it 'signs user + instructeur + administrateur out' do
         sign_in user
-        sign_in administrateur
+        sign_in(administrateur.user)
         delete :destroy
         expect(@response.redirect?).to be(true)
         expect(subject.current_user).to be(nil)

spec/features/admin/procedure_cloning_spec.rb

@@ -7,7 +7,7 @@ feature 'As an administrateur I wanna clone a procedure', js: true do
   let(:administrateur) { create(:administrateur) }
 
   before do
-    login_as administrateur, scope: :administrateur
+    login_as administrateur.user, scope: :user
     visit new_from_existing_admin_procedures_path
   end
 

spec/features/admin/procedure_creation_spec.rb

@@ -7,7 +7,7 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
   let(:administrateur) { create(:administrateur, :with_procedure) }
 
   before do
-    login_as administrateur, scope: :administrateur
+    login_as administrateur.user, scope: :user
     visit root_path
   end
 

spec/features/admin/procedure_update_spec.rb

@@ -14,7 +14,7 @@ feature 'Administrateurs can edit procedures', js: true do
   end
 
   before do
-    login_as administrateur, scope: :administrateur
+    login_as administrateur.user, scope: :user
   end
 
   context 'when the procedure is in draft' do

spec/features/new_administrateur/types_de_champ_spec.rb

@@ -5,7 +5,7 @@ feature 'As an administrateur I can edit types de champ', js: true do
   let(:procedure) { create(:procedure) }
 
   before do
-    login_as administrateur, scope: :administrateur
+    login_as administrateur.user, scope: :user
     visit champs_procedure_path(procedure)
   end