Fix tests II

Author: RandomByte

lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -2,6 +2,7 @@ const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateFle
 const flexChangesBundler = require("../../processors/bundlers/flexChangesBundler");
 const semver = require("semver");
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task to create changesBundle.json file containing all changes stored in the /changes folder for easier consumption
  * at runtime.
@@ -16,10 +17,13 @@ const semver = require("semver");
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
  * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} [parameters.options] Options
- * @param {string} [parameters.options.namespace] Application Namespace
+ * @param {string} [parameters.options.projectNamespace] Project Namespace
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, taskUtil, options: {namespace}}) {
+module.exports = async function({workspace, taskUtil, options = {}}) {
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	// Use the given namespace if available, otherwise use no namespace
 	// (e.g. in case no manifest.json is present)
 	let pathPrefix = "";

lib/tasks/generateCachebusterInfo.js

@@ -28,6 +28,7 @@ function getSigner(type) {
 	}
 }
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task to generate the application cachebuster info file.
  *
@@ -36,11 +37,15 @@ function getSigner(type) {
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
  * @param {object} parameters.options Options
- * @param {string} parameters.options.namespace Namespace of the application
+ * @param {string} parameters.options.projectNamespace Namespace of the application
  * @param {string} [parameters.options.signatureType='time'] Type of signature to be used ('time' or 'hash')
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = function({workspace, options: {namespace, signatureType}}) {
+module.exports = function({workspace, options}) {
+	const {signatureType} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	const basePath = `/resources/${namespace}/`;
 	return workspace.byGlob(`/resources/${namespace}/**/*`)
 		.then(async (resources) => {

lib/tasks/generateLibraryManifest.js

@@ -47,7 +47,7 @@ module.exports = function({workspace, taskUtil, options: {projectName}}) {
 						namespace: libraryNamespace,
 						resources,
 						getProjectVersion: (projectName) => {
-							return taskUtil.getProject(projectName)?.getVersion();
+							return taskUtil?.getProject(projectName)?.getVersion();
 						},
 						options: {
 						}

lib/tasks/generateThemeDesignerResources.js

@@ -187,6 +187,7 @@ async function generateCssVariablesLess({workspace, combo, namespace}) {
 	}
 }
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Generates resources required for integration with the SAP Theme Designer.
  *
@@ -198,11 +199,16 @@ async function generateCssVariablesLess({workspace, combo, namespace}) {
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
  * @param {string} parameters.options.version Project version
- * @param {string} [parameters.options.namespace] If the project is of type <code>library</code>, provide its namespace.
+ * @param {string} [parameters.options.projectNamespace] If the project is of type <code>library</code>,
+ * 														 provide its namespace.
  * Omit for type <code>theme-library</code>
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, dependencies, options: {projectName, version, namespace}}) {
+module.exports = async function({workspace, dependencies, options}) {
+	const {projectName, version} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	// Skip sap.ui.documentation since it is not intended to be available in SAP Theme Designer to create custom themes
 	if (namespace === "sap/ui/documentation") {
 		return;

lib/tasks/transformBootstrapHtml.js

@@ -1,6 +1,7 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:transformBootstrapHtml");
 const bootstrapHtmlTransformer = require("../processors/bootstrapHtmlTransformer");
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task for transforming the application bootstrap HTML file.
  *
@@ -12,7 +13,11 @@ const bootstrapHtmlTransformer = require("../processors/bootstrapHtmlTransformer
  * @param {string} [parameters.options.namespace] Project namespace
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, options: {projectName, namespace}}) {
+module.exports = async function({workspace, options}) {
+	const {projectName} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	let indexPath;
 	if (namespace) {
 		indexPath = `/resources/${namespace}/index.html`;

test/lib/processors/versionInfoGenerator.js

@@ -16,10 +16,12 @@ test.beforeEach((t) => {
 	t.context.warnLogStub = sinon.stub();
 	t.context.infoLogStub = sinon.stub();
 	t.context.verboseLogStub = sinon.stub();
+	t.context.sillyLogStub = sinon.stub();
 	sinon.stub(logger, "getLogger").returns({
 		warn: t.context.warnLogStub,
 		info: t.context.infoLogStub,
 		verbose: t.context.verboseLogStub,
+		silly: t.context.sillyLogStub,
 		isLevelEnabled: () => true
 	});
 	versionInfoGenerator = mock.reRequire("../../../lib/processors/versionInfoGenerator");

test/lib/tasks/generateLibraryManifest.js

@@ -8,18 +8,8 @@ function createWorkspace() {
 	return resourceFactory.createAdapter({
 		virBasePath: "/",
 		project: {
-			metadata: {
-				name: "test.lib"
-			},
-			version: "2.0.0",
-			dependencies: [
-				{
-					metadata: {
-						name: "sap.ui.core"
-					},
-					version: "1.0.0"
-				}
-			]
+			getName: () => "test.lib",
+			getVersion: () => "2.0.0",
 		}
 	});
 }
@@ -31,6 +21,13 @@ async function assertCreatedManifest(t, oExpectedManifest) {
 
 	await generateLibraryManifest({
 		workspace,
+		taskUtil: {
+			getProject: () => {
+				return {
+					getVersion: () => "1.0.0"
+				};
+			}
+		},
 		options: {
 			projectName: "Test Lib"
 		}

test/lib/tasks/generateVersionInfo.js

@@ -98,11 +98,13 @@ test.beforeEach((t) => {
 	t.context.errorLogStub = sinon.stub();
 	t.context.warnLogStub = sinon.stub();
 	t.context.infoLogStub = sinon.stub();
+	t.context.sillyLogStub = sinon.stub();
 	sinon.stub(logger, "getLogger").returns({
 		verbose: t.context.verboseLogStub,
 		error: t.context.errorLogStub,
 		warn: t.context.warnLogStub,
 		info: t.context.infoLogStub,
+		silly: t.context.sillyLogStub,
 		isLevelEnabled: () => true
 	});
 	mock.reRequire("../../../lib/processors/versionInfoGenerator");
@@ -149,8 +151,8 @@ test.serial("integration: Library without i18n bundle file", async (t) => {
 		"version": "1.33.7",
 	}, oOptions);
 
-	t.is(t.context.verboseLogStub.callCount, 7);
-	t.is(t.context.verboseLogStub.getCall(3).args[0],
+	t.is(t.context.verboseLogStub.callCount, 4);
+	t.is(t.context.verboseLogStub.getCall(1).args[0],
 		"Cannot add meta information for library 'test.lib3'. The manifest.json file cannot be found");
 });