From 5a78cf0e27176e518203d3f1a3481144456e9916 Mon Sep 17 00:00:00 2001 From: vaibhavgholap23 Date: Wed, 26 Oct 2022 00:35:25 +0530 Subject: [PATCH 1/2] added test case for RepoMergeUpstreamResult struct marshaling --- github/repos_merging_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/github/repos_merging_test.go b/github/repos_merging_test.go index 0275915b9b..24a4db9042 100644 --- a/github/repos_merging_test.go +++ b/github/repos_merging_test.go @@ -126,3 +126,21 @@ func TestRepositoriesService_MergeUpstream(t *testing.T) { return resp, err }) } + +func TestRepoMergeUpstreamResult_Marshal(t *testing.T) { + testJSONMarshal(t, &RepoMergeUpstreamResult{}, "{}") + + u := &RepoMergeUpstreamResult{ + Message: String("message"), + MergeType: String("merge_type"), + BaseBranch: String("base_branch"), + } + + want := `{ + "message": "message", + "merge_type":"merge_type", + "base_branch":"base_branch" + }` + + testJSONMarshal(t, u, want) +} From 462812f70cfcd02f485a141def2934604318be66 Mon Sep 17 00:00:00 2001 From: vaibhavgholap23 Date: Wed, 26 Oct 2022 00:48:16 +0530 Subject: [PATCH 2/2] changes updated --- github/repos_merging_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github/repos_merging_test.go b/github/repos_merging_test.go index 24a4db9042..09a03a19a6 100644 --- a/github/repos_merging_test.go +++ b/github/repos_merging_test.go @@ -138,8 +138,8 @@ func TestRepoMergeUpstreamResult_Marshal(t *testing.T) { want := `{ "message": "message", - "merge_type":"merge_type", - "base_branch":"base_branch" + "merge_type": "merge_type", + "base_branch": "base_branch" }` testJSONMarshal(t, u, want)