toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[MM-14887] Include all png, jpeg, and bmp MIME types (#2781)

Browse source 
* Include all png, jpeg, and bmp MIME types

* Update snapshot
This commit is contained in:
Miguel Alatzar 2019-05-09 14:18:24 -07:00 committed by Miguel Alatzar
parent 20ac82f4ba
commit 886ef3f8c9
3 changed files with 52 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/components/attachment_button.test.js
View file

@ -6,6 +6,7 @@ import {shallow} from 'enzyme';
import Preferences from 'mattermost-redux/constants/preferences';
import {VALID_MIME_TYPES} from 'app/screens/edit_profile/edit_profile';
import AttachmentButton from './attachment_button';
jest.mock('react-intl');
@ -30,7 +31,7 @@ describe('AttachmentButton', () => {
test('should not upload file with invalid MIME type', () => {
const props = {
...baseProps,
validMimeTypes: ['image/jpeg'],
validMimeTypes: VALID_MIME_TYPES,
onShowUnsupportedMimeTypeWarning: jest.fn(),
};
@ -51,7 +52,7 @@ describe('AttachmentButton', () => {
test('should upload file with valid MIME type', () => {
const props = {
...baseProps,
validMimeTypes: ['image/jpeg'],
validMimeTypes: VALID_MIME_TYPES,
onShowUnsupportedMimeTypeWarning: jest.fn(),
};
@ -60,12 +61,14 @@ describe('AttachmentButton', () => {
);
const file = {
type: 'image/jpeg',
fileSize: 10,
fileName: 'test',
};
wrapper.instance().uploadFiles([file]);
expect(props.onShowUnsupportedMimeTypeWarning).not.toHaveBeenCalled();
expect(props.uploadFiles).toHaveBeenCalled();
VALID_MIME_TYPES.forEach((mimeType) => {
file.type = mimeType;
wrapper.instance().uploadFiles([file]);
expect(props.onShowUnsupportedMimeTypeWarning).not.toHaveBeenCalled();
expect(props.uploadFiles).toHaveBeenCalled();
});
});
});

21
app/screens/edit_profile/__snapshots__/edit_profile.test.js.snap
View file

@ -108,8 +108,29 @@ exports[`edit_profile should match snapshot 1`] = `
validMimeTypes={
Array [
"image/jpeg",
"image/jpeg",
"image/jpg",
"image/jp_",
"application/jpg",
"application/x-jpg",
"image/pjpeg",
"image/pipeg",
"image/vnd.swiftview-jpeg",
"image/x-xbitmap",
"image/png",
"application/png",
"application/x-png",
"image/bmp",
"image/x-bmp",
"image/x-bitmap",
"image/x-xbitmap",
"image/x-win-bitmap",
"image/x-windows-bmp",
"image/ms-bmp",
"image/x-ms-bmp",
"application/bmp",
"application/x-bmp",
"application/x-win-bitmap",
]
}
wrapper={true}

23
app/screens/edit_profile/edit_profile.js
View file

@ -28,10 +28,31 @@ import mattermostBucket from 'app/mattermost_bucket';
import {getFormattedFileSize} from 'mattermost-redux/utils/file_utils';
const MAX_SIZE = 20 * 1024 * 1024;
const VALID_MIME_TYPES = [
export const VALID_MIME_TYPES = [
'image/jpeg',
'image/jpeg',
'image/jpg',
'image/jp_',
'application/jpg',
'application/x-jpg',
'image/pjpeg',
'image/pipeg',
'image/vnd.swiftview-jpeg',
'image/x-xbitmap',
'image/png',
'application/png',
'application/x-png',
'image/bmp',
'image/x-bmp',
'image/x-bitmap',
'image/x-xbitmap',
'image/x-win-bitmap',
'image/x-windows-bmp',
'image/ms-bmp',
'image/x-ms-bmp',
'application/bmp',
'application/x-bmp',
'application/x-win-bitmap',
];
const holders = {
firstName: {