Платформа ЦРНП "Мирокод" для разработки проектов
https://git.mirocod.ru
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
171 lines
5.2 KiB
171 lines
5.2 KiB
// Copyright 2020 The Gitea Authors. All rights reserved. |
|
// Use of this source code is governed by a MIT-style |
|
// license that can be found in the LICENSE file. |
|
|
|
package integrations |
|
|
|
import ( |
|
"net/http" |
|
"net/url" |
|
"testing" |
|
"time" |
|
|
|
"code.gitea.io/gitea/models" |
|
"code.gitea.io/gitea/models/unittest" |
|
user_model "code.gitea.io/gitea/models/user" |
|
pull_service "code.gitea.io/gitea/services/pull" |
|
repo_service "code.gitea.io/gitea/services/repository" |
|
files_service "code.gitea.io/gitea/services/repository/files" |
|
|
|
"github.com/stretchr/testify/assert" |
|
) |
|
|
|
func TestAPIPullUpdate(t *testing.T) { |
|
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { |
|
//Create PR to test |
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User) |
|
org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26}).(*user_model.User) |
|
pr := createOutdatedPR(t, user, org26) |
|
|
|
//Test GetDiverging |
|
diffCount, err := pull_service.GetDiverging(pr) |
|
assert.NoError(t, err) |
|
assert.EqualValues(t, 1, diffCount.Behind) |
|
assert.EqualValues(t, 1, diffCount.Ahead) |
|
assert.NoError(t, pr.LoadBaseRepo()) |
|
assert.NoError(t, pr.LoadIssue()) |
|
|
|
session := loginUser(t, "user2") |
|
token := getTokenForLoggedInUser(t, session) |
|
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/pulls/%d/update?token="+token, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index) |
|
session.MakeRequest(t, req, http.StatusOK) |
|
|
|
//Test GetDiverging after update |
|
diffCount, err = pull_service.GetDiverging(pr) |
|
assert.NoError(t, err) |
|
assert.EqualValues(t, 0, diffCount.Behind) |
|
assert.EqualValues(t, 2, diffCount.Ahead) |
|
}) |
|
} |
|
|
|
func TestAPIPullUpdateByRebase(t *testing.T) { |
|
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { |
|
//Create PR to test |
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User) |
|
org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26}).(*user_model.User) |
|
pr := createOutdatedPR(t, user, org26) |
|
|
|
//Test GetDiverging |
|
diffCount, err := pull_service.GetDiverging(pr) |
|
assert.NoError(t, err) |
|
assert.EqualValues(t, 1, diffCount.Behind) |
|
assert.EqualValues(t, 1, diffCount.Ahead) |
|
assert.NoError(t, pr.LoadBaseRepo()) |
|
assert.NoError(t, pr.LoadIssue()) |
|
|
|
session := loginUser(t, "user2") |
|
token := getTokenForLoggedInUser(t, session) |
|
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/pulls/%d/update?style=rebase&token="+token, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index) |
|
session.MakeRequest(t, req, http.StatusOK) |
|
|
|
//Test GetDiverging after update |
|
diffCount, err = pull_service.GetDiverging(pr) |
|
assert.NoError(t, err) |
|
assert.EqualValues(t, 0, diffCount.Behind) |
|
assert.EqualValues(t, 1, diffCount.Ahead) |
|
}) |
|
} |
|
|
|
func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *models.PullRequest { |
|
baseRepo, err := repo_service.CreateRepository(actor, actor, models.CreateRepoOptions{ |
|
Name: "repo-pr-update", |
|
Description: "repo-tmp-pr-update description", |
|
AutoInit: true, |
|
Gitignores: "C,C++", |
|
License: "MIT", |
|
Readme: "Default", |
|
IsPrivate: false, |
|
}) |
|
assert.NoError(t, err) |
|
assert.NotEmpty(t, baseRepo) |
|
|
|
headRepo, err := repo_service.ForkRepository(actor, forkOrg, repo_service.ForkRepoOptions{ |
|
BaseRepo: baseRepo, |
|
Name: "repo-pr-update", |
|
Description: "desc", |
|
}) |
|
assert.NoError(t, err) |
|
assert.NotEmpty(t, headRepo) |
|
|
|
//create a commit on base Repo |
|
_, err = files_service.CreateOrUpdateRepoFile(baseRepo, actor, &files_service.UpdateRepoFileOptions{ |
|
TreePath: "File_A", |
|
Message: "Add File A", |
|
Content: "File A", |
|
IsNewFile: true, |
|
OldBranch: "master", |
|
NewBranch: "master", |
|
Author: &files_service.IdentityOptions{ |
|
Name: actor.Name, |
|
Email: actor.Email, |
|
}, |
|
Committer: &files_service.IdentityOptions{ |
|
Name: actor.Name, |
|
Email: actor.Email, |
|
}, |
|
Dates: &files_service.CommitDateOptions{ |
|
Author: time.Now(), |
|
Committer: time.Now(), |
|
}, |
|
}) |
|
assert.NoError(t, err) |
|
|
|
//create a commit on head Repo |
|
_, err = files_service.CreateOrUpdateRepoFile(headRepo, actor, &files_service.UpdateRepoFileOptions{ |
|
TreePath: "File_B", |
|
Message: "Add File on PR branch", |
|
Content: "File B", |
|
IsNewFile: true, |
|
OldBranch: "master", |
|
NewBranch: "newBranch", |
|
Author: &files_service.IdentityOptions{ |
|
Name: actor.Name, |
|
Email: actor.Email, |
|
}, |
|
Committer: &files_service.IdentityOptions{ |
|
Name: actor.Name, |
|
Email: actor.Email, |
|
}, |
|
Dates: &files_service.CommitDateOptions{ |
|
Author: time.Now(), |
|
Committer: time.Now(), |
|
}, |
|
}) |
|
assert.NoError(t, err) |
|
|
|
//create Pull |
|
pullIssue := &models.Issue{ |
|
RepoID: baseRepo.ID, |
|
Title: "Test Pull -to-update-", |
|
PosterID: actor.ID, |
|
Poster: actor, |
|
IsPull: true, |
|
} |
|
pullRequest := &models.PullRequest{ |
|
HeadRepoID: headRepo.ID, |
|
BaseRepoID: baseRepo.ID, |
|
HeadBranch: "newBranch", |
|
BaseBranch: "master", |
|
HeadRepo: headRepo, |
|
BaseRepo: baseRepo, |
|
Type: models.PullRequestGitea, |
|
} |
|
err = pull_service.NewPullRequest(baseRepo, pullIssue, nil, nil, pullRequest, nil) |
|
assert.NoError(t, err) |
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{Title: "Test Pull -to-update-"}).(*models.Issue) |
|
pr, err := models.GetPullRequestByIssueID(issue.ID) |
|
assert.NoError(t, err) |
|
|
|
return pr |
|
}
|
|
|