From f72b97a9154edb3adad0078ca231407f798449e2 Mon Sep 17 00:00:00 2001 From: yagotome Date: Wed, 17 Jul 2019 23:52:06 -0300 Subject: [PATCH 1/2] Fix getFileName lib --- src/lib/getFileName.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/getFileName.js b/src/lib/getFileName.js index d5c74d5f0f..386c88b3f0 100644 --- a/src/lib/getFileName.js +++ b/src/lib/getFileName.js @@ -11,9 +11,6 @@ export default function getFileName(name) { if (name instanceof Parse.File) { return getFileName(name.name()); } - let offset = 37; - if (name.indexOf('tfss-') === 0) { - offset += 5; - } + const offset = name.indexOf('_') + 1; return name.substr(offset); } From 68e8fd36ac26fef14c2b6c7ef01e79987d8ef7ff Mon Sep 17 00:00:00 2001 From: yagotome Date: Wed, 17 Jul 2019 23:52:17 -0300 Subject: [PATCH 2/2] Add tests for getFileName lib --- src/lib/tests/getFileName.test.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/lib/tests/getFileName.test.js diff --git a/src/lib/tests/getFileName.test.js b/src/lib/tests/getFileName.test.js new file mode 100644 index 0000000000..72aa20fb80 --- /dev/null +++ b/src/lib/tests/getFileName.test.js @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016-present, Parse, LLC + * All rights reserved. + * + * This source code is licensed under the license found in the LICENSE file in + * the root directory of this source tree. + */ +jest.dontMock('../getFileName'); +const getFileName = require('../getFileName').default; +const Parse = require('parse'); + +describe('getFileName', () => { + it('get filename prefixed with hex', () => { + const actualFilename = 'profile.jpg'; + expect(getFileName(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`)).toBe(actualFilename); + + const parseFile = new Parse.File(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`); + expect(getFileName(parseFile)).toBe(actualFilename); + }); + + it('get filename containing underscore and prefixed with hex', () => { + const actualFilename = 'bg_img.png'; + expect(getFileName(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`)).toBe(actualFilename); + + const parseFile = new Parse.File(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`); + expect(getFileName(parseFile)).toBe(actualFilename); + }); +});