diff options
author | Paul Okstad <pokstad@gitlab.com> | 2019-02-28 21:37:27 +0300 |
---|---|---|
committer | Paul Okstad <pokstad@gitlab.com> | 2019-02-28 21:37:27 +0300 |
commit | d29150c41cf85a9b93117cee938cc75df2f78e7e (patch) | |
tree | ab742775266fd5937098c22ab35197ac2f478400 | |
parent | f90d3a55dc4b521a348ee2088999a34fa85d256d (diff) | |
parent | 9ba6d597c0f216092f00bd79b3bdb26691a13d0f (diff) |
Merge branch 'user-commit-files-test-helper' into 'master'
Reduce number of arguments in UserCommitFiles test helper
See merge request gitlab-org/gitaly!1097
-rw-r--r-- | internal/service/operations/commit_files_test.go | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/internal/service/operations/commit_files_test.go b/internal/service/operations/commit_files_test.go index b62192c0b..3026c431d 100644 --- a/internal/service/operations/commit_files_test.go +++ b/internal/service/operations/commit_files_test.go @@ -90,7 +90,9 @@ func TestSuccessfulUserCommitFilesRequest(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { ctx := metadata.NewOutgoingContext(ctxOuter, md) - headerRequest := headerRequest(tc.repo, user, tc.branchName, commitFilesMessage, authorName, authorEmail) + headerRequest := headerRequest(tc.repo, user, tc.branchName, commitFilesMessage) + setAuthorAndEmail(headerRequest, authorName, authorEmail) + actionsRequest1 := createFileHeaderRequest(filePath) actionsRequest2 := actionContentRequest("My") actionsRequest3 := actionContentRequest(" content") @@ -130,6 +132,12 @@ func TestSuccessfulUserCommitFilesRequest(t *testing.T) { } } +func setAuthorAndEmail(headerRequest *gitalypb.UserCommitFilesRequest, authorName, authorEmail []byte) { + header := headerRequest.UserCommitFilesRequestPayload.(*gitalypb.UserCommitFilesRequest_Header).Header + header.CommitAuthorName = authorName + header.CommitAuthorEmail = authorEmail +} + func TestSuccessfulUserCommitFilesRequestMove(t *testing.T) { server, serverSocketPath := runFullServer(t) defer server.Stop() @@ -162,7 +170,8 @@ func TestSuccessfulUserCommitFilesRequestMove(t *testing.T) { origFileContent := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "show", branchName+":"+previousFilePath) md := testhelper.GitalyServersMetadata(t, serverSocketPath) ctx := metadata.NewOutgoingContext(ctxOuter, md) - headerRequest := headerRequest(testRepo, user, branchName, commitFilesMessage, authorName, authorEmail) + headerRequest := headerRequest(testRepo, user, branchName, commitFilesMessage) + setAuthorAndEmail(headerRequest, authorName, authorEmail) actionsRequest1 := moveFileHeaderRequest(previousFilePath, filePath, tc.infer) stream, err := client.UserCommitFiles(ctx) @@ -207,7 +216,7 @@ func TestFailedUserCommitFilesRequestDueToHooks(t *testing.T) { branchName := "feature" filePath := "my/file.txt" - headerRequest := headerRequest(testRepo, user, branchName, commitFilesMessage, nil, nil) + headerRequest := headerRequest(testRepo, user, branchName, commitFilesMessage) actionsRequest1 := createFileHeaderRequest(filePath) actionsRequest2 := actionContentRequest("My content") hookContent := []byte("#!/bin/sh\nprintenv | paste -sd ' ' -\nexit 1") @@ -258,7 +267,7 @@ func TestFailedUserCommitFilesRequestDueToIndexError(t *testing.T) { { desc: "file already exists", requests: []*gitalypb.UserCommitFilesRequest{ - headerRequest(testRepo, user, "feature", commitFilesMessage, nil, nil), + headerRequest(testRepo, user, "feature", commitFilesMessage), createFileHeaderRequest("README.md"), actionContentRequest("This file already exists"), }, @@ -267,7 +276,7 @@ func TestFailedUserCommitFilesRequestDueToIndexError(t *testing.T) { { desc: "file doesn't exists", requests: []*gitalypb.UserCommitFilesRequest{ - headerRequest(testRepo, user, "feature", commitFilesMessage, nil, nil), + headerRequest(testRepo, user, "feature", commitFilesMessage), chmodFileHeaderRequest("documents/story.txt", true), }, indexError: "A file with this name doesn't exist", @@ -275,7 +284,7 @@ func TestFailedUserCommitFilesRequestDueToIndexError(t *testing.T) { { desc: "dir already exists", requests: []*gitalypb.UserCommitFilesRequest{ - headerRequest(testRepo, user, "utf-dir", commitFilesMessage, nil, nil), + headerRequest(testRepo, user, "utf-dir", commitFilesMessage), actionRequest(&gitalypb.UserCommitFilesAction{ UserCommitFilesActionPayload: &gitalypb.UserCommitFilesAction_Header{ Header: &gitalypb.UserCommitFilesActionHeader{ @@ -329,19 +338,19 @@ func TestFailedUserCommitFilesRequest(t *testing.T) { }{ { desc: "empty Repository", - req: headerRequest(nil, user, branchName, commitFilesMessage, nil, nil), + req: headerRequest(nil, user, branchName, commitFilesMessage), }, { desc: "empty User", - req: headerRequest(testRepo, nil, branchName, commitFilesMessage, nil, nil), + req: headerRequest(testRepo, nil, branchName, commitFilesMessage), }, { desc: "empty BranchName", - req: headerRequest(testRepo, user, "", commitFilesMessage, nil, nil), + req: headerRequest(testRepo, user, "", commitFilesMessage), }, { desc: "empty CommitMessage", - req: headerRequest(testRepo, user, branchName, nil, nil, nil), + req: headerRequest(testRepo, user, branchName, nil), }, } @@ -359,18 +368,16 @@ func TestFailedUserCommitFilesRequest(t *testing.T) { } } -func headerRequest(repo *gitalypb.Repository, user *gitalypb.User, branchName string, commitMessage, authorName, authorEmail []byte) *gitalypb.UserCommitFilesRequest { +func headerRequest(repo *gitalypb.Repository, user *gitalypb.User, branchName string, commitMessage []byte) *gitalypb.UserCommitFilesRequest { return &gitalypb.UserCommitFilesRequest{ UserCommitFilesRequestPayload: &gitalypb.UserCommitFilesRequest_Header{ Header: &gitalypb.UserCommitFilesRequestHeader{ - Repository: repo, - User: user, - BranchName: []byte(branchName), - CommitMessage: commitMessage, - CommitAuthorName: authorName, - CommitAuthorEmail: authorEmail, - StartBranchName: nil, - StartRepository: nil, + Repository: repo, + User: user, + BranchName: []byte(branchName), + CommitMessage: commitMessage, + StartBranchName: nil, + StartRepository: nil, }, }, } |