String trim added to all mnodules involving branch names and refactores describe in test cases to be synchronous

Author: neel1996

git/gitAddBranchApi.js

@@ -12,8 +12,9 @@ const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitAddBranchApi = async (repoId, branchName) => {
   try {
-    if(branchName.match(/[^a-zA-Z0-9-_.:~@$^/\\s\\r\\n]/gi)){
-      throw new Error("Invalid branch name string")
+    branchName = branchName.trim();
+    if (branchName.match(/[^a-zA-Z0-9-_.:~@$^/\\s\\r\\n]/gi)) {
+      throw new Error("Invalid branch name string");
     }
 
     return await execPromisified(`git checkout -b "${branchName}"`, {

git/gitBranchDeleteApi.js

@@ -14,6 +14,7 @@ const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitDeleteBranchApi = async (repoId, branchName, forceFlag) => {
   try {
+    branchName = branchName.trim();
     if (branchName.match(/[^a-zA-Z0-9-_.:~@$^/\\s\\r\\n]/gi)) {
       throw new Error("Invalid branchName string!");
     }

git/gitFetchPullApi.js

@@ -49,6 +49,7 @@ const gitFetchApi = async (repoId, remoteUrl = "", remoteBranch = "") => {
   const remoteName = await getRemoteName(repoId, remoteUrl);
   console.log("Selected remote name : ", remoteName);
 
+  remoteBranch = remoteBranch.trim();
   let invalidInput = false;
 
   if (
@@ -124,6 +125,8 @@ const gitPullApi = async (repoId, remoteUrl, remoteBranch) => {
   const remoteName = await getRemoteName(repoId, remoteUrl);
   console.log("Selected remote name : ", remoteName);
 
+  remoteBranch = remoteBranch.trim();
+
   if (!remoteName) {
     console.log("NO REMOTE MATCHING THE URL");
 

git/gitPushToRemoteAPI.js

@@ -30,6 +30,7 @@ const gitPushToRemoteApi = async (repoId, remoteHost, branch) => {
           .join("");
 
         const remoteName = filteredRemote.trim().split(/\s/gi)[0];
+        branch = branch.trim();
 
         if (branch.match(/[^a-zA-Z0-9-_.:~@$^/\\s\\n\\r]/gi)) {
           console.log(

git/gitSetBranch.js

@@ -12,6 +12,8 @@ const fetchRepopath = require("../global/fetchGitRepoPath");
  */
 
 const gitSetBranchApi = async (repoId, branch) => {
+  branch = branch.trim();
+  
   if (branch.match(/[^a-zA-Z0-9-_.:~@$^/\\s\\r\\n]/gi)) {
     console.log("Invalid branch string!");
     return "BRANCH_SET_FAILED";

tests/git-tests/gitAddBranchApi.test.js

@@ -3,7 +3,7 @@ const { getSelectedRepoId } = require("../common/fetchTestRepoId");
 
 const testBranch = "JEST_TEST_BRANCH";
 
-describe("test module for - gitAddBranchApi", async () => {
+describe("test module for - gitAddBranchApi", () => {
   test("positive test case for gitAddBranchApi", async () => {
     const repoId = await getSelectedRepoId();
     const addBranchResult = await gitAddBranchApi(repoId, testBranch);

tests/git-tests/gitBranchDeleteApi.test.js

@@ -1,25 +1,31 @@
 const { gitDeleteBranchApi } = require("../../git/gitBranchDeleteApi");
+const { gitAddBranchApi } = require("../../git/gitAddBranchApi");
 const { getSelectedRepoId } = require("../common/fetchTestRepoId");
 const { gitSetBranchApi } = require("../../git/gitSetBranch");
 
 const testBranch = "JEST_TEST_BRANCH";
 
-describe("test module for - gitBranchDeleteApi", async () => {
+describe("test module for - gitBranchDeleteApi", () => {
   test("positive test case for gitBranchDeleteApi", async () => {
     const repoId = await getSelectedRepoId();
-    await gitSetBranchApi(repoId, "master");
+    const setBranchStatus = await gitSetBranchApi(repoId, "master");
+    const addBranchStatus = await gitAddBranchApi(repoId, testBranch);
 
-    const addBranchResult = await gitDeleteBranchApi(repoId, testBranch, true);
+    const deleteBranchResult = await gitDeleteBranchApi(
+      repoId,
+      testBranch,
+      true
+    );
 
-    expect(addBranchResult).toBeTruthy();
-    expect(addBranchResult.status).toBe("BRANCH_DELETE_SUCCESS");
+    expect(deleteBranchResult).toBeTruthy();
+    expect(deleteBranchResult.status).toBe("BRANCH_DELETE_SUCCESS");
   });
 
   test("negative test case for gitAddBranchApi", async () => {
     const repoId = await getSelectedRepoId();
-    const addBranchResult = await gitDeleteBranchApi(repoId, ",./\\", true);
+    const deleteBranchResult = await gitDeleteBranchApi(repoId, ",./\\", true);
 
-    expect(addBranchResult).toBeTruthy();
-    expect(addBranchResult.status).toBe("BRANCH_DELETE_FAILED");
+    expect(deleteBranchResult).toBeTruthy();
+    expect(deleteBranchResult.status).toBe("BRANCH_DELETE_FAILED");
   });
 });

tests/git-tests/gitFolderDetailsApi.test.js

@@ -2,8 +2,9 @@ const { gitFetchFolderContentApi } = require("../../git/gitFolderDetailsApi");
 const { getSelectedRepoId } = require("../common/fetchTestRepoId");
 
 test("Test module for - gitFolderDetailsApi", async () => {
+  const repoId = await getSelectedRepoId();
   const { gitFileBasedCommit, gitTrackedFiles } = await (
-    await gitFetchFolderContentApi(await getSelectedRepoId(), "")
+    await gitFetchFolderContentApi(repoId, ".")
   ).gitFolderContent;
 
   expect(typeof gitFileBasedCommit).toBe("object");