From 86fe61288cd11ee70b60391bb979074a6ba42acd Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Fri, 30 Apr 2021 14:30:42 +0200
Subject: [PATCH] Api refactor, return object for updateRef & fix snapshot test

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/api/GitReleaseApiClient.test.ts          |  2 +-
 .../src/api/GitReleaseApiClient.ts               | 16 ++++++++++------
 .../src/features/Patch/hooks/usePatch.ts         |  2 +-
 .../src/test-helpers/test-helpers.ts             |  8 +++++---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts
index 8977c36d4d..76c9bf4fff 100644
--- a/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts
@@ -48,7 +48,7 @@ describe('GitReleaseApiClient', () => {
         "getRepoPath": [Function],
         "getRepositories": [Function],
         "getRepository": [Function],
-        "getSingleTag": [Function],
+        "getTag": [Function],
         "getUser": [Function],
         "githubAuthApi": Object {
           "getAccessToken": [MockFunction],
diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
index b01ed7d73f..688b3e322d 100644
--- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
@@ -390,9 +390,11 @@ export class GitReleaseApiClient implements GitReleaseApi {
     });
 
     return {
-      ref: updatedRef.ref,
-      object: {
-        sha: updatedRef.object.sha,
+      reference: {
+        ref: updatedRef.ref,
+        object: {
+          sha: updatedRef.object.sha,
+        },
       },
     };
   };
@@ -687,9 +689,11 @@ export interface GitReleaseApi {
       force: boolean;
     } & OwnerRepo,
   ) => Promise<{
-    ref: string;
-    object: {
-      sha: string;
+    reference: {
+      ref: string;
+      object: {
+        sha: string;
+      };
     };
   }>;
 
diff --git a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
index 4d4d92414e..67caecce90 100644
--- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
+++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
@@ -216,7 +216,7 @@ export function usePatch({
     abortIfError(cherryPickRes.error);
     if (!cherryPickRes.value) return undefined;
 
-    const updatedReference = await pluginApiClient
+    const { reference: updatedReference } = await pluginApiClient
       .updateRef({
         owner: project.owner,
         repo: project.repo,
diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
index 68015feaa0..e2a1132861 100644
--- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts
+++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
@@ -267,9 +267,11 @@ export const mockApiClient: GitReleaseApi = {
   })),
 
   updateRef: jest.fn(async () => ({
-    ref: 'mock_update_ref_ref',
-    object: {
-      sha: 'mock_update_ref_object_sha',
+    reference: {
+      ref: 'mock_update_ref_ref',
+      object: {
+        sha: 'mock_update_ref_object_sha',
+      },
     },
   })),