From ba918cc1d24abd393a7f5989d58428ac10ffa754 Mon Sep 17 00:00:00 2001 From: Chris Brody Date: Sat, 5 Sep 2020 21:44:24 -0400 Subject: [PATCH 1/3] cleanup: simplify deprecated indication --- src/cordova/platform/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cordova/platform/list.js b/src/cordova/platform/list.js index 5ab1adc66..1be405940 100644 --- a/src/cordova/platform/list.js +++ b/src/cordova/platform/list.js @@ -58,7 +58,7 @@ function addDeprecatedInformationToPlatforms (platformsList) { var platformKey = p.split(' ')[0]; // Remove Version Information // allow for 'unknown' platforms, which will not exist in platforms if ((platforms.info[platformKey] || {}).deprecated) { - p = p.concat(' ', '(deprecated)'); + p = p.concat('- deprecated'); } return p; }); From 609f291dfcb199eb616b911cb3d814a3e88743ae Mon Sep 17 00:00:00 2001 From: Chris Brody Date: Sat, 5 Sep 2020 21:50:19 -0400 Subject: [PATCH 2/3] update test cases --- spec/cordova/platform/listDeprecated.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/cordova/platform/listDeprecated.spec.js b/spec/cordova/platform/listDeprecated.spec.js index 369caf7ae..ff1fc5e42 100644 --- a/spec/cordova/platform/listDeprecated.spec.js +++ b/spec/cordova/platform/listDeprecated.spec.js @@ -57,12 +57,12 @@ describe('cordova/platform/list show deprecated platforms info', function () { it('shows available platforms with deprecated info', () => { return platform_list(hooks_mock, projectRoot, { save: true }) .then((result) => { - expect(events.emit).toHaveBeenCalledWith('results', jasmine.stringMatching(/Installed platforms:[\s\S]*Available.*:[\s]*android 1.2.3[\s]*wp7 4.5.6 \(deprecated\)/)); + expect(events.emit).toHaveBeenCalledWith('results', jasmine.stringMatching(/Installed platforms:[\s\S]*Available.*:[\s]*android 1.2.3[\s]*wp7 4.5.6 - deprecated/)); }); }); it('returns platform list with deprecated info', function () { var platformList = ['android 1.2.3', 'wp7 4.5.6']; - expect(platform_list.addDeprecatedInformationToPlatforms(platformList)).toEqual(['android 1.2.3', 'wp7 4.5.6 (deprecated)']); + expect(platform_list.addDeprecatedInformationToPlatforms(platformList)).toEqual(['android 1.2.3', 'wp7 4.5.6 - deprecated']); }); }); From 30cef2911fba45372df2f15704bfe8fe2f336cb8 Mon Sep 17 00:00:00 2001 From: Chris Brody Date: Sat, 5 Sep 2020 21:54:16 -0400 Subject: [PATCH 3/3] fix oops in src/cordova/platform/list.js --- src/cordova/platform/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cordova/platform/list.js b/src/cordova/platform/list.js index 1be405940..a434b2b88 100644 --- a/src/cordova/platform/list.js +++ b/src/cordova/platform/list.js @@ -58,7 +58,7 @@ function addDeprecatedInformationToPlatforms (platformsList) { var platformKey = p.split(' ')[0]; // Remove Version Information // allow for 'unknown' platforms, which will not exist in platforms if ((platforms.info[platformKey] || {}).deprecated) { - p = p.concat('- deprecated'); + p = p.concat(' - deprecated'); } return p; });