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.

pull_update_test.go 4.0KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142
  1. // Copyright 2020 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package integrations
  5. import (
  6. "net/http"
  7. "net/url"
  8. "testing"
  9. "time"
  10. "code.gitea.io/gitea/models"
  11. "code.gitea.io/gitea/modules/repofiles"
  12. repo_module "code.gitea.io/gitea/modules/repository"
  13. pull_service "code.gitea.io/gitea/services/pull"
  14. repo_service "code.gitea.io/gitea/services/repository"
  15. "github.com/stretchr/testify/assert"
  16. )
  17. func TestAPIPullUpdate(t *testing.T) {
  18. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  19. //Create PR to test
  20. user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
  21. org26 := models.AssertExistsAndLoadBean(t, &models.User{ID: 26}).(*models.User)
  22. pr := createOutdatedPR(t, user, org26)
  23. //Test GetDiverging
  24. diffCount, err := pull_service.GetDiverging(pr)
  25. assert.NoError(t, err)
  26. assert.EqualValues(t, 1, diffCount.Behind)
  27. assert.EqualValues(t, 1, diffCount.Ahead)
  28. assert.NoError(t, pr.LoadBaseRepo())
  29. assert.NoError(t, pr.LoadIssue())
  30. session := loginUser(t, "user2")
  31. token := getTokenForLoggedInUser(t, session)
  32. req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/pulls/%d/update?token="+token, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index)
  33. session.MakeRequest(t, req, http.StatusOK)
  34. //Test GetDiverging after update
  35. diffCount, err = pull_service.GetDiverging(pr)
  36. assert.NoError(t, err)
  37. assert.EqualValues(t, 0, diffCount.Behind)
  38. assert.EqualValues(t, 2, diffCount.Ahead)
  39. })
  40. }
  41. func createOutdatedPR(t *testing.T, actor, forkOrg *models.User) *models.PullRequest {
  42. baseRepo, err := repo_service.CreateRepository(actor, actor, models.CreateRepoOptions{
  43. Name: "repo-pr-update",
  44. Description: "repo-tmp-pr-update description",
  45. AutoInit: true,
  46. Gitignores: "C,C++",
  47. License: "MIT",
  48. Readme: "Default",
  49. IsPrivate: false,
  50. })
  51. assert.NoError(t, err)
  52. assert.NotEmpty(t, baseRepo)
  53. headRepo, err := repo_module.ForkRepository(actor, forkOrg, models.ForkRepoOptions{
  54. BaseRepo: baseRepo,
  55. Name: "repo-pr-update",
  56. Description: "desc",
  57. })
  58. assert.NoError(t, err)
  59. assert.NotEmpty(t, headRepo)
  60. //create a commit on base Repo
  61. _, err = repofiles.CreateOrUpdateRepoFile(baseRepo, actor, &repofiles.UpdateRepoFileOptions{
  62. TreePath: "File_A",
  63. Message: "Add File A",
  64. Content: "File A",
  65. IsNewFile: true,
  66. OldBranch: "master",
  67. NewBranch: "master",
  68. Author: &repofiles.IdentityOptions{
  69. Name: actor.Name,
  70. Email: actor.Email,
  71. },
  72. Committer: &repofiles.IdentityOptions{
  73. Name: actor.Name,
  74. Email: actor.Email,
  75. },
  76. Dates: &repofiles.CommitDateOptions{
  77. Author: time.Now(),
  78. Committer: time.Now(),
  79. },
  80. })
  81. assert.NoError(t, err)
  82. //create a commit on head Repo
  83. _, err = repofiles.CreateOrUpdateRepoFile(headRepo, actor, &repofiles.UpdateRepoFileOptions{
  84. TreePath: "File_B",
  85. Message: "Add File on PR branch",
  86. Content: "File B",
  87. IsNewFile: true,
  88. OldBranch: "master",
  89. NewBranch: "newBranch",
  90. Author: &repofiles.IdentityOptions{
  91. Name: actor.Name,
  92. Email: actor.Email,
  93. },
  94. Committer: &repofiles.IdentityOptions{
  95. Name: actor.Name,
  96. Email: actor.Email,
  97. },
  98. Dates: &repofiles.CommitDateOptions{
  99. Author: time.Now(),
  100. Committer: time.Now(),
  101. },
  102. })
  103. assert.NoError(t, err)
  104. //create Pull
  105. pullIssue := &models.Issue{
  106. RepoID: baseRepo.ID,
  107. Title: "Test Pull -to-update-",
  108. PosterID: actor.ID,
  109. Poster: actor,
  110. IsPull: true,
  111. }
  112. pullRequest := &models.PullRequest{
  113. HeadRepoID: headRepo.ID,
  114. BaseRepoID: baseRepo.ID,
  115. HeadBranch: "newBranch",
  116. BaseBranch: "master",
  117. HeadRepo: headRepo,
  118. BaseRepo: baseRepo,
  119. Type: models.PullRequestGitea,
  120. }
  121. err = pull_service.NewPullRequest(baseRepo, pullIssue, nil, nil, pullRequest, nil)
  122. assert.NoError(t, err)
  123. issue := models.AssertExistsAndLoadBean(t, &models.Issue{Title: "Test Pull -to-update-"}).(*models.Issue)
  124. pr, err := models.GetPullRequestByIssueID(issue.ID)
  125. assert.NoError(t, err)
  126. return pr
  127. }