[FIX] ui5Framework t8r: Resolve versionOverride string

Resolve "latest" to latest version.
SAP · Apr 1, 2020 · 4fffabe · 4fffabe
1 parent b760d99
commit 4fffabe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/lib/translators/ui5Framework.js b/lib/translators/ui5Framework.js
@@ -136,17 +136,24 @@ module.exports = {
 			);
 		}
 
+		let Resolver;
+		if (frameworkName === "OpenUI5") {
+			Resolver = require("../ui5Framework/Openui5Resolver");
+		} else if (frameworkName === "SAPUI5") {
+			Resolver = require("../ui5Framework/Sapui5Resolver");
+		}
+
 		let version;
 		if (!tree.framework.version) {
 			throw new Error(
 				`framework.version is not defined for project ${tree.id}`
 			);
 		} else if (options.versionOverride) {
+			version = await Resolver.resolveVersion(options.versionOverride, {cwd: tree.path});
 			log.info(
 				`Overriding configured ${frameworkName} version ` +
-				`${tree.framework.version} with supplied version ${options.versionOverride}`
+				`${tree.framework.version} with version ${version}`
 			);
-			version = options.versionOverride;
 		} else {
 			version = tree.framework.version;
 		}
@@ -159,14 +166,7 @@ module.exports = {
 
 		log.info(`Using ${frameworkName} version: ${version}`);
 
-		let resolver;
-		if (frameworkName === "OpenUI5") {
-			const Openui5Resolver = require("../ui5Framework/Openui5Resolver");
-			resolver = new Openui5Resolver({cwd: tree.path, version});
-		} else if (frameworkName === "SAPUI5") {
-			const Sapui5Resolver = require("../ui5Framework/Sapui5Resolver");
-			resolver = new Sapui5Resolver({cwd: tree.path, version});
-		}
+		const resolver = new Resolver({cwd: tree.path, version});
 
 		let startTime;
 		if (log.isLevelEnabled("verbose")) {

diff --git a/test/lib/translators/ui5Framework.js b/test/lib/translators/ui5Framework.js
@@ -13,6 +13,8 @@ test.beforeEach((t) => {
 			install: t.context.Sapui5ResolverInstallStub
 		};
 	});
+	t.context.Sapui5ResolverResolveVersionStub = sinon.stub();
+	t.context.Sapui5ResolverStub.resolveVersion = t.context.Sapui5ResolverResolveVersionStub;
 	mock("../../../lib/ui5Framework/Sapui5Resolver", t.context.Sapui5ResolverStub);
 
 	t.context.Openui5ResolverStub = sinon.stub();
@@ -120,6 +122,8 @@ test.serial("generateDependencyTree (with versionOverride)", async (t) => {
 
 	t.context.Sapui5ResolverInstallStub.resolves({libraryMetadata});
 
+	t.context.Sapui5ResolverResolveVersionStub.resolves("1.99.9");
+
 	const getProjectStub = sinon.stub();
 	getProjectStub.onFirstCall().returns({fake: "metadata-project-1"});
 	getProjectStub.onSecondCall().returns({fake: "metadata-project-2"});
@@ -131,10 +135,10 @@ test.serial("generateDependencyTree (with versionOverride)", async (t) => {
 			};
 		});
 
-	await ui5Framework.generateDependencyTree(tree, {versionOverride: "1.99.0"});
+	await ui5Framework.generateDependencyTree(tree, {versionOverride: "1.99"});
 
 	t.is(t.context.Sapui5ResolverStub.callCount, 1, "Sapui5Resolver#constructor should be called once");
-	t.deepEqual(t.context.Sapui5ResolverStub.getCall(0).args, [{cwd: tree.path, version: "1.99.0"}],
+	t.deepEqual(t.context.Sapui5ResolverStub.getCall(0).args, [{cwd: tree.path, version: "1.99.9"}],
 		"Sapui5Resolver#constructor should be called with expected args");
 });