approve method added with merge param

Author: pashidlos

src/components/TestDetailsModal.tsx

@@ -157,7 +157,7 @@ const TestDetailsModal: React.FunctionComponent<{
                 <Button
                   color="inherit"
                   onClick={() =>
-                    testRunService.approve(testRun.id).then((testRun) => {
+                    testRunService.approve(testRun.id, testRun.merge).then((testRun) => {
                       updateTestRun(testRunDispatch, testRun);
                     })
                   }

src/services/testRun.service.ts

@@ -50,15 +50,16 @@ function recalculateDiff(id: string): Promise<TestRun> {
   ).then(handleResponse);
 }
 
-function approve(id: string): Promise<TestRun> {
+function approve(id: string, merge: boolean): Promise<TestRun> {
   const requestOptions = {
     method: "GET",
     headers: authHeader(),
   };
 
-  return fetch(`${API_URL}${ENDPOINT_URL}/approve/${id}`, requestOptions).then(
-    handleResponse
-  );
+  return fetch(
+    `${API_URL}${ENDPOINT_URL}/approve?id=${id}&merge=${merge}`,
+    requestOptions
+  ).then(handleResponse);
 }
 
 function reject(id: string): Promise<TestRun> {

src/types/testRun.ts

@@ -19,4 +19,5 @@ export interface TestRun {
   comment?: string;
   branchName: string;
   baselineBranchName: string;
+  merge: boolean;
 }