From 0fb4f8f3f0263406849966059783a30a6fd13a6a Mon Sep 17 00:00:00 2001 From: Maxim Sukharev Date: Thu, 17 Oct 2019 12:24:07 +0200 Subject: [PATCH 1/2] Add GetPullRequestDiff method --- default_api.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/default_api.go b/default_api.go index 21587a1..b5a5581 100644 --- a/default_api.go +++ b/default_api.go @@ -10855,7 +10855,7 @@ func (a *DefaultApiService) StreamDiff_39(path string, localVarOptionals map[str @param "whitespace" (string) optional whitespace flag which can be set to <code>ignore-all</code> @param "withComments" (bool) <code>true</code> to embed comments in the diff (the default); otherwise, <code>false</code> to stream the diff without comments @return */ -func (a *DefaultApiService) StreamDiff_40(localVarOptionals map[string]interface{}) (*APIResponse, error) { +func (a *DefaultApiService) GetPullRequestDiff(projectKey, repositorySlug string, pullRequestID int, localVarOptionals map[string]interface{}) (*APIResponse, error) { var ( localVarHTTPMethod = strings.ToUpper("Get") localVarPostBody interface{} @@ -10865,6 +10865,9 @@ func (a *DefaultApiService) StreamDiff_40(localVarOptionals map[string]interface // create path and map variables localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId}/diff" + localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1) + localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1) + localVarPath = strings.Replace(localVarPath, "{"+"pullRequestId"+"}", fmt.Sprintf("%v", pullRequestID), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} From e5d4d4354bf6d5ebde18b154bd95af51309ee934 Mon Sep 17 00:00:00 2001 From: Maxim Sukharev Date: Thu, 17 Oct 2019 16:52:47 +0200 Subject: [PATCH 2/2] Fix tests --- default_api_test.go | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/default_api_test.go b/default_api_test.go index 62d783f..0f8fe93 100644 --- a/default_api_test.go +++ b/default_api_test.go @@ -5129,8 +5129,8 @@ func TestDefaultApiService_SetPermissionForGroup(t *testing.T) { client *APIClient } type args struct { - projectKey string - repositorySlug string + projectKey string + repositorySlug string localVarOptionals map[string]interface{} } tests := []struct { @@ -5763,11 +5763,14 @@ func TestDefaultApiService_StreamDiff_39(t *testing.T) { } } -func TestDefaultApiService_StreamDiff_40(t *testing.T) { +func TestDefaultApiService_GetPullRequestDiff(t *testing.T) { type fields struct { client *APIClient } type args struct { + projectKey string + repositorySlug string + pullRequestID int localVarOptionals map[string]interface{} } tests := []struct { @@ -5777,20 +5780,24 @@ func TestDefaultApiService_StreamDiff_40(t *testing.T) { want *APIResponse wantErr bool }{ - {"networkErrorContextExceeded", fields{client: generateConfigFake()}, args{}, &APIResponse{Message: "Get https://stash.domain.com/rest/api/1.0/projects/%7BprojectKey%7D/repos/%7BrepositorySlug%7D/pull-requests/%7BpullRequestId%7D/diff: context canceled"}, true}, + {"networkErrorContextExceeded", fields{client: generateConfigFake()}, args{ + projectKey: "projectKey", + repositorySlug: "repositorySlug", + pullRequestID: 1, + }, &APIResponse{Message: "Get https://stash.domain.com/rest/api/1.0/projects/projectKey/repos/repositorySlug/pull-requests/1/diff: context canceled"}, true}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { a := &DefaultApiService{ client: tt.fields.client, } - got, err := a.StreamDiff_40(tt.args.localVarOptionals) + got, err := a.GetPullRequestDiff(tt.args.projectKey, tt.args.repositorySlug, tt.args.pullRequestID, tt.args.localVarOptionals) if (err != nil) != tt.wantErr { - t.Errorf("DefaultApiService.StreamDiff_40() error = %v, wantErr %v", err, tt.wantErr) + t.Errorf("DefaultApiService.GetPullRequestDiff() error = %v, wantErr %v", err, tt.wantErr) return } if !reflect.DeepEqual(got, tt.want) { - t.Errorf("DefaultApiService.StreamDiff_40() = %v, want %v", got, tt.want) + t.Errorf("DefaultApiService.GetPullRequestDiff() = %v, want %v", got, tt.want) } }) }