[INTERNAL] createWorkspace: Remove dead code and test uncovered paths

Author: matz3

lib/graph/helpers/createWorkspace.js

@@ -37,8 +37,7 @@ export default async function createWorkspace({
 			filePath = path.join(cwd, configPath);
 		}
 		try {
-			const workspaceConfigs =
-				await readWorkspaceConfigFile(filePath, );
+			const workspaceConfigs = await readWorkspaceConfigFile(filePath);
 			const configuration = workspaceConfigs.find((config) => {
 				return config.metadata.name === name;
 			});
@@ -69,7 +68,7 @@ export default async function createWorkspace({
 	}
 }
 
-async function readWorkspaceConfigFile(filePath, throwIfMissing) {
+async function readWorkspaceConfigFile(filePath) {
 	const {
 		default: fs
 	} = await import("graceful-fs");
@@ -92,13 +91,7 @@ async function readWorkspaceConfigFile(filePath, throwIfMissing) {
 			filename: filePath,
 		});
 	} catch (err) {
-		if (err.name === "YAMLException") {
-			throw new Error(`Failed to parse workspace configuration at ` +
-			`${filePath}\nError: ${err.message}`);
-		} else {
-			throw new Error(
-				`Failed to parse workspace configuration at ${filePath}: ${err.message}`);
-		}
+		throw new Error(`Failed to parse workspace configuration at ${filePath}\nError: ${err.message}`);
 	}
 
 	if (!configs || !configs.length) {

test/lib/graph/helpers/createWorkspace.js

@@ -117,6 +117,29 @@ test("createWorkspace: Using invalid object", async (t) => {
 		"Threw with validation error");
 });
 
+test("createWorkspace: Using name and object with different workspace name", async (t) => {
+	const {createWorkspace} = t.context;
+
+	const err = await t.throwsAsync(createWorkspace({
+		cwd: "cwd",
+		name: "my-workspace",
+		configObject: {
+			metadata: {
+				name: "my-other-workspace"
+			},
+			dependencyManagement: {
+				resolutions: [{
+					path: "resolution/path"
+				}]
+			}
+		}
+	}));
+	t.is(err.message,
+		`The provided workspace name 'my-workspace' does not match ` +
+		`the provided workspace configuration 'my-other-workspace'`,
+		"Threw with validation error");
+});
+
 test("createWorkspace: Using file", async (t) => {
 	const {createWorkspace, MockWorkspace, workspaceConstructorStub} = t.context;
 
@@ -171,6 +194,20 @@ test("createWorkspace: Using missing file", async (t) => {
 	t.is(workspaceConstructorStub.callCount, 0, "Workspace constructor did not get called");
 });
 
+test("createWorkspace: Missing default workspace in file", async (t) => {
+	const {createWorkspace, workspaceConstructorStub} = t.context;
+
+	const res = await createWorkspace({
+		cwd: path.join(fixturesPath, "library.h"),
+		name: "default",
+		configPath: path.join(fixturesPath, "library.h", "custom-ui5-workspace.yaml")
+	});
+
+	t.is(res, null, "Returned no workspace");
+
+	t.is(workspaceConstructorStub.callCount, 0, "Workspace constructor did not get called");
+});
+
 test("createWorkspace: Using missing file and non-default name", async (t) => {
 	const {createWorkspace, workspaceConstructorStub} = t.context;