IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try fix upload_spec flakys and remove logging from tasks/uploads_spec

Browse Source
This commit is contained in:
Martin Brennan
2020-02-18 15:08:58 +10:00
parent 64b3512084
commit 500185dc11
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spec/models/upload_spec.rb
View File

@@ -426,26 +426,22 @@ describe Upload do
SiteSetting.login_required = true
upload.update!(secure: false)
CustomEmoji.create(name: 'meme', upload: upload)
expect { upload.update_secure_status }
.not_to change { upload.secure }
upload.update_secure_status
expect(upload.reload.secure).to eq(false)
end
it 'does not mark an upload whose origin matches a regular emoji as secure (sometimes emojis are downloaded in pull_hotlinked_images)' do
SiteSetting.login_required = true
grinning = Emoji.all.last
upload.update!(secure: false, origin: "http://localhost:3000#{grinning.url}")
expect { upload.update_secure_status }
.not_to change { upload.secure }
falafel = Emoji.all.find { |e| e.url == '/images/emoji/twitter/falafel.png?v=9' }
upload.update!(secure: false, origin: "http://localhost:3000#{falafel.url}")
upload.update_secure_status
expect(upload.reload.secure).to eq(false)
end
it 'does not mark any upload with origin containing images/emoji in the URL' do
SiteSetting.login_required = true
upload.update!(secure: false, origin: "http://localhost:3000/images/emoji/test.png")
expect { upload.update_secure_status }
.not_to change { upload.secure }
upload.update_secure_status
expect(upload.reload.secure).to eq(false)
end
end