diff --git a/__tests__/camera.test.ts b/__tests__/camera.test.ts index 79991aa1..81c8171d 100644 --- a/__tests__/camera.test.ts +++ b/__tests__/camera.test.ts @@ -12,7 +12,7 @@ const RICOH : Camera = { model: 'RICOH GR III', }; -export const SONY_CAMERAS = { +export const SONY_MODELS = { 'ILCE-1M2': 'A1 II', 'ILCE-1': 'A1', 'ILCE-9M3': 'A9 III', @@ -75,10 +75,10 @@ describe('Camera', () => { expect(formatCameraText(NIKON, 'short')).toBe('D7000'); }); it('formats Sony cameras', () => { - Object.entries(SONY_CAMERAS).forEach(([model, expected]) => { + Object.entries(SONY_MODELS).forEach(([model, expected]) => { const camera = { make: MAKE_SONY, model }; expect(formatCameraText(camera, 'medium')) - .toBe(expected.toLocaleUpperCase()); + .toBe(`${MAKE_SONY} ${expected}`.toLocaleUpperCase()); }); }); }); diff --git a/src/platforms/sony.ts b/src/platforms/sony.ts index bf6b234d..0b44ff55 100644 --- a/src/platforms/sony.ts +++ b/src/platforms/sony.ts @@ -13,7 +13,6 @@ export const formatSonyModel = (model: string) => { letter, version, modifier, - // eslint-disable-next-line max-len ] = /^(ILCE|ILME)-([0-9]*)([a-ln-z]*)M*([0-9]*)([a-z]*)/gi.exec(model) ?? []; const versionNumber = parseInt(version || '0'); const versionRomanNumeral = versionNumber > 1 && versionNumber < 10