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

Merge pull request #3644 from betagouv/fix-3641

Browse source 
[Fix #3641] Do not change PJ value in API if PJ is safe
This commit is contained in:
Mathieu Magnin 2019-03-20 11:44:48 +01:00 • committed by GitHub
commit a1156c8c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/champs/piece_justificative_champ.rb
View file

@ -49,7 +49,7 @@ class Champs::PieceJustificativeChamp < Champ
end end
def for_api def for_api
if piece_justificative_file.attached? && virus_scan&.safe? if piece_justificative_file.attached? && (virus_scan&.safe? || virus_scan&.pending?)
Rails.application.routes.url_helpers.url_for(piece_justificative_file) Rails.application.routes.url_helpers.url_for(piece_justificative_file)
end end
end end

2
spec/models/champs/piece_justificative_champ_spec.rb
View file

@ -13,7 +13,7 @@ describe Champs::PieceJustificativeChamp do
context 'when file is not scanned' do context 'when file is not scanned' do
let(:status) { 'pending' } let(:status) { 'pending' }
it { is_expected.to be_nil } it { is_expected.to include("/rails/active_storage/blobs/") }
end end
context 'when file is infected' do context 'when file is infected' do