From f21e9afc0ce53a1cfdecf1c2a15025407bf7ef5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 2 Jul 2019 13:50:50 +0200 Subject: [PATCH] fix: incorrect condition for upgrade newer version check --- packages/cli/src/commands/upgrade/__tests__/upgrade.test.js | 4 ++++ packages/cli/src/commands/upgrade/upgrade.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js index 81a271ec6..01766beea 100644 --- a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js +++ b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js @@ -147,6 +147,10 @@ test('errors when older version passed', async () => { expect(logger.error).toBeCalledWith( `Trying to upgrade from newer version "${currentVersion}" to older "${olderVersion}"`, ); + await upgrade.func(['0.57.10'], ctx, opts); + expect(logger.error).not.toBeCalledWith( + `Trying to upgrade from newer version "${currentVersion}" to older "0.57.10"`, + ); }, 60000); test('warns when dependency upgrade version is in semver range', async () => { diff --git a/packages/cli/src/commands/upgrade/upgrade.js b/packages/cli/src/commands/upgrade/upgrade.js index ba6875bd5..43e5749d3 100644 --- a/packages/cli/src/commands/upgrade/upgrade.js +++ b/packages/cli/src/commands/upgrade/upgrade.js @@ -110,13 +110,13 @@ const getVersionToUpgradeTo = async (argv, currentVersion, projectDir) => { return null; } - if (currentVersion > newVersion) { + if (semver.gt(currentVersion, newVersion)) { logger.error( `Trying to upgrade from newer version "${currentVersion}" to older "${newVersion}"`, ); return null; } - if (currentVersion === newVersion) { + if (semver.eq(currentVersion, newVersion)) { const { dependencies: {'react-native': version}, } = require(path.join(projectDir, 'package.json'));