diff --git a/app/controllers/instructeurs/procedures_controller.rb b/app/controllers/instructeurs/procedures_controller.rb index e861843c0..7efeb7f6a 100644 --- a/app/controllers/instructeurs/procedures_controller.rb +++ b/app/controllers/instructeurs/procedures_controller.rb @@ -394,7 +394,7 @@ module Instructeurs end def last_export_for(statut) - Export.where(instructeur_id: current_instructeur.id, statut: statut, updated_at: 1.hour.ago..).last + Export.where(user_profile: current_instructeur, statut: statut, updated_at: 1.hour.ago..).last end def cookies_export_key diff --git a/spec/controllers/instructeurs/procedures_controller_spec.rb b/spec/controllers/instructeurs/procedures_controller_spec.rb index c9ed33830..62e5c990f 100644 --- a/spec/controllers/instructeurs/procedures_controller_spec.rb +++ b/spec/controllers/instructeurs/procedures_controller_spec.rb @@ -777,15 +777,18 @@ describe Instructeurs::ProceduresController, type: :controller do end context 'when the turbo_stream format is used' do + render_views + before do post :download_export, - params: { export_format: :csv, procedure_id: procedure.id }, + params: { export_format: :csv, procedure_id: procedure.id, statut: 'traites' }, format: :turbo_stream end it 'responds in the correct format' do expect(response.media_type).to eq('text/vnd.turbo-stream.html') expect(response).to have_http_status(:ok) + expect(response.body).to include(polling_last_export_instructeur_procedure_path(procedure)) end end diff --git a/spec/factories/export.rb b/spec/factories/export.rb index 28da15cb6..e8c1bb325 100644 --- a/spec/factories/export.rb +++ b/spec/factories/export.rb @@ -7,7 +7,7 @@ FactoryBot.define do after(:build) do |export, _evaluator| export.key = Export.generate_cache_key(export.groupe_instructeurs.map(&:id), export.procedure_presentation) - export.instructeur = export.groupe_instructeurs.first&.instructeurs&.first + export.user_profile = export.groupe_instructeurs.first&.instructeurs&.first if export.user_profile.nil? export.dossiers_count = 10 if !export.pending? end end