From 6a6a1816513925aa532b9213778ad4eff1b27325 Mon Sep 17 00:00:00 2001 From: Haocen Xu Date: Sun, 5 Jul 2020 12:20:15 -0400 Subject: [PATCH] Fix tests --- js/test/AttachmentViewer.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/test/AttachmentViewer.js b/js/test/AttachmentViewer.js index 54ddfc1a..4be0f7ec 100644 --- a/js/test/AttachmentViewer.js +++ b/js/test/AttachmentViewer.js @@ -21,6 +21,9 @@ describe('AttachmentViewer', function () { mimeType.substring(0, 6) === 'video/' || mimeType.match(/\/pdf/i) ), + fileNameAndSizeDisplaySupported = ( + typeof filename === 'string' && filename.length && btoa(rawdata).length > 0 + ), results = [], result = ''; prefix = prefix.replace(/%(s|d)/g, '%%'); @@ -66,12 +69,12 @@ describe('AttachmentViewer', function () { $.PrivateBin.AttachmentViewer.showAttachment(); results.push( !$('#attachment').hasClass('hidden') && - (previewSupported ? !$('#attachmentPreview').hasClass('hidden') : $('#attachmentPreview').hasClass('hidden')) + (previewSupported || fileNameAndSizeDisplaySupported ? !$('#attachmentPreview').hasClass('hidden') : $('#attachmentPreview').hasClass('hidden')) ); $.PrivateBin.AttachmentViewer.hideAttachment(); results.push( $('#attachment').hasClass('hidden') && - (previewSupported ? !$('#attachmentPreview').hasClass('hidden') : $('#attachmentPreview').hasClass('hidden')) + (previewSupported || fileNameAndSizeDisplaySupported ? !$('#attachmentPreview').hasClass('hidden') : $('#attachmentPreview').hasClass('hidden')) ); if (previewSupported) { $.PrivateBin.AttachmentViewer.hideAttachmentPreview(); @@ -80,7 +83,7 @@ describe('AttachmentViewer', function () { $.PrivateBin.AttachmentViewer.showAttachment(); results.push( !$('#attachment').hasClass('hidden') && - (previewSupported ? !$('#attachmentPreview').hasClass('hidden') : $('#attachmentPreview').hasClass('hidden')) + (previewSupported || fileNameAndSizeDisplaySupported ? !$('#attachmentPreview').hasClass('hidden') : $('#attachmentPreview').hasClass('hidden')) ); let element = $('
'); $.PrivateBin.AttachmentViewer.moveAttachmentTo(element, prefix + '%s' + postfix);