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_merge_test.go 23KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589
  1. // Copyright 2017 The Gitea Authors. All rights reserved.
  2. // SPDX-License-Identifier: MIT
  3. package integration
  4. import (
  5. "bytes"
  6. "context"
  7. "fmt"
  8. "net/http"
  9. "net/http/httptest"
  10. "net/url"
  11. "os"
  12. "path"
  13. "strings"
  14. "testing"
  15. "time"
  16. "code.gitea.io/gitea/models"
  17. auth_model "code.gitea.io/gitea/models/auth"
  18. "code.gitea.io/gitea/models/db"
  19. issues_model "code.gitea.io/gitea/models/issues"
  20. repo_model "code.gitea.io/gitea/models/repo"
  21. "code.gitea.io/gitea/models/unittest"
  22. user_model "code.gitea.io/gitea/models/user"
  23. "code.gitea.io/gitea/models/webhook"
  24. "code.gitea.io/gitea/modules/git"
  25. "code.gitea.io/gitea/modules/gitrepo"
  26. api "code.gitea.io/gitea/modules/structs"
  27. "code.gitea.io/gitea/modules/test"
  28. "code.gitea.io/gitea/modules/translation"
  29. "code.gitea.io/gitea/services/pull"
  30. repo_service "code.gitea.io/gitea/services/repository"
  31. files_service "code.gitea.io/gitea/services/repository/files"
  32. "github.com/stretchr/testify/assert"
  33. )
  34. func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string, mergeStyle repo_model.MergeStyle, deleteBranch bool) *httptest.ResponseRecorder {
  35. req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
  36. resp := session.MakeRequest(t, req, http.StatusOK)
  37. htmlDoc := NewHTMLParser(t, resp.Body)
  38. link := path.Join(user, repo, "pulls", pullnum, "merge")
  39. options := map[string]string{
  40. "_csrf": htmlDoc.GetCSRF(),
  41. "do": string(mergeStyle),
  42. }
  43. if deleteBranch {
  44. options["delete_branch_after_merge"] = "on"
  45. }
  46. req = NewRequestWithValues(t, "POST", link, options)
  47. resp = session.MakeRequest(t, req, http.StatusOK)
  48. respJSON := struct {
  49. Redirect string
  50. }{}
  51. DecodeJSON(t, resp, &respJSON)
  52. assert.EqualValues(t, fmt.Sprintf("/%s/%s/pulls/%s", user, repo, pullnum), respJSON.Redirect)
  53. return resp
  54. }
  55. func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder {
  56. req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
  57. resp := session.MakeRequest(t, req, http.StatusOK)
  58. // Click the little button to create a pull
  59. htmlDoc := NewHTMLParser(t, resp.Body)
  60. link, exists := htmlDoc.doc.Find(".timeline-item .delete-button").Attr("data-url")
  61. assert.True(t, exists, "The template has changed, can not find delete button url")
  62. req = NewRequestWithValues(t, "POST", link, map[string]string{
  63. "_csrf": htmlDoc.GetCSRF(),
  64. })
  65. resp = session.MakeRequest(t, req, http.StatusOK)
  66. return resp
  67. }
  68. func TestPullMerge(t *testing.T) {
  69. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  70. hookTasks, err := webhook.HookTasks(db.DefaultContext, 1, 1) // Retrieve previous hook number
  71. assert.NoError(t, err)
  72. hookTasksLenBefore := len(hookTasks)
  73. session := loginUser(t, "user1")
  74. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  75. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
  76. resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
  77. elem := strings.Split(test.RedirectURL(resp), "/")
  78. assert.EqualValues(t, "pulls", elem[3])
  79. testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
  80. hookTasks, err = webhook.HookTasks(db.DefaultContext, 1, 1)
  81. assert.NoError(t, err)
  82. assert.Len(t, hookTasks, hookTasksLenBefore+1)
  83. })
  84. }
  85. func TestPullRebase(t *testing.T) {
  86. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  87. hookTasks, err := webhook.HookTasks(db.DefaultContext, 1, 1) // Retrieve previous hook number
  88. assert.NoError(t, err)
  89. hookTasksLenBefore := len(hookTasks)
  90. session := loginUser(t, "user1")
  91. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  92. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
  93. resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
  94. elem := strings.Split(test.RedirectURL(resp), "/")
  95. assert.EqualValues(t, "pulls", elem[3])
  96. testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebase, false)
  97. hookTasks, err = webhook.HookTasks(db.DefaultContext, 1, 1)
  98. assert.NoError(t, err)
  99. assert.Len(t, hookTasks, hookTasksLenBefore+1)
  100. })
  101. }
  102. func TestPullRebaseMerge(t *testing.T) {
  103. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  104. hookTasks, err := webhook.HookTasks(db.DefaultContext, 1, 1) // Retrieve previous hook number
  105. assert.NoError(t, err)
  106. hookTasksLenBefore := len(hookTasks)
  107. session := loginUser(t, "user1")
  108. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  109. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
  110. resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
  111. elem := strings.Split(test.RedirectURL(resp), "/")
  112. assert.EqualValues(t, "pulls", elem[3])
  113. testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebaseMerge, false)
  114. hookTasks, err = webhook.HookTasks(db.DefaultContext, 1, 1)
  115. assert.NoError(t, err)
  116. assert.Len(t, hookTasks, hookTasksLenBefore+1)
  117. })
  118. }
  119. func TestPullSquash(t *testing.T) {
  120. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  121. hookTasks, err := webhook.HookTasks(db.DefaultContext, 1, 1) // Retrieve previous hook number
  122. assert.NoError(t, err)
  123. hookTasksLenBefore := len(hookTasks)
  124. session := loginUser(t, "user1")
  125. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  126. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
  127. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited!)\n")
  128. resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
  129. elem := strings.Split(test.RedirectURL(resp), "/")
  130. assert.EqualValues(t, "pulls", elem[3])
  131. testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleSquash, false)
  132. hookTasks, err = webhook.HookTasks(db.DefaultContext, 1, 1)
  133. assert.NoError(t, err)
  134. assert.Len(t, hookTasks, hookTasksLenBefore+1)
  135. })
  136. }
  137. func TestPullCleanUpAfterMerge(t *testing.T) {
  138. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  139. session := loginUser(t, "user1")
  140. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  141. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited - TestPullCleanUpAfterMerge)\n")
  142. resp := testPullCreate(t, session, "user1", "repo1", false, "master", "feature/test", "This is a pull title")
  143. elem := strings.Split(test.RedirectURL(resp), "/")
  144. assert.EqualValues(t, "pulls", elem[3])
  145. testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
  146. // Check PR branch deletion
  147. resp = testPullCleanUp(t, session, elem[1], elem[2], elem[4])
  148. respJSON := struct {
  149. Redirect string
  150. }{}
  151. DecodeJSON(t, resp, &respJSON)
  152. assert.NotEmpty(t, respJSON.Redirect, "Redirected URL is not found")
  153. elem = strings.Split(respJSON.Redirect, "/")
  154. assert.EqualValues(t, "pulls", elem[3])
  155. // Check branch deletion result
  156. req := NewRequest(t, "GET", respJSON.Redirect)
  157. resp = session.MakeRequest(t, req, http.StatusOK)
  158. htmlDoc := NewHTMLParser(t, resp.Body)
  159. resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
  160. assert.EqualValues(t, "Branch \"user1/repo1:feature/test\" has been deleted.", resultMsg)
  161. })
  162. }
  163. func TestCantMergeWorkInProgress(t *testing.T) {
  164. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  165. session := loginUser(t, "user1")
  166. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  167. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
  168. resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "[wip] This is a pull title")
  169. req := NewRequest(t, "GET", test.RedirectURL(resp))
  170. resp = session.MakeRequest(t, req, http.StatusOK)
  171. htmlDoc := NewHTMLParser(t, resp.Body)
  172. text := strings.TrimSpace(htmlDoc.doc.Find(".merge-section > .item").Last().Text())
  173. assert.NotEmpty(t, text, "Can't find WIP text")
  174. assert.Contains(t, text, translation.NewLocale("en-US").TrString("repo.pulls.cannot_merge_work_in_progress"), "Unable to find WIP text")
  175. assert.Contains(t, text, "[wip]", "Unable to find WIP text")
  176. })
  177. }
  178. func TestCantMergeConflict(t *testing.T) {
  179. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  180. session := loginUser(t, "user1")
  181. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  182. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")
  183. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base", "README.md", "Hello, World (Edited Twice)\n")
  184. // Use API to create a conflicting pr
  185. token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
  186. req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
  187. Head: "conflict",
  188. Base: "base",
  189. Title: "create a conflicting pr",
  190. }).AddTokenAuth(token)
  191. session.MakeRequest(t, req, http.StatusCreated)
  192. // Now this PR will be marked conflict - or at least a race will do - so drop down to pure code at this point...
  193. user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
  194. Name: "user1",
  195. })
  196. repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
  197. OwnerID: user1.ID,
  198. Name: "repo1",
  199. })
  200. pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
  201. HeadRepoID: repo1.ID,
  202. BaseRepoID: repo1.ID,
  203. HeadBranch: "conflict",
  204. BaseBranch: "base",
  205. })
  206. gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo1)
  207. assert.NoError(t, err)
  208. err = pull.Merge(context.Background(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "CONFLICT", false)
  209. assert.Error(t, err, "Merge should return an error due to conflict")
  210. assert.True(t, models.IsErrMergeConflicts(err), "Merge error is not a conflict error")
  211. err = pull.Merge(context.Background(), pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT", false)
  212. assert.Error(t, err, "Merge should return an error due to conflict")
  213. assert.True(t, models.IsErrRebaseConflicts(err), "Merge error is not a conflict error")
  214. gitRepo.Close()
  215. })
  216. }
  217. func TestCantMergeUnrelated(t *testing.T) {
  218. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  219. session := loginUser(t, "user1")
  220. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  221. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base", "README.md", "Hello, World (Edited Twice)\n")
  222. // Now we want to create a commit on a branch that is totally unrelated to our current head
  223. // Drop down to pure code at this point
  224. user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
  225. Name: "user1",
  226. })
  227. repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
  228. OwnerID: user1.ID,
  229. Name: "repo1",
  230. })
  231. path := repo_model.RepoPath(user1.Name, repo1.Name)
  232. err := git.NewCommand(git.DefaultContext, "read-tree", "--empty").Run(&git.RunOpts{Dir: path})
  233. assert.NoError(t, err)
  234. stdin := bytes.NewBufferString("Unrelated File")
  235. var stdout strings.Builder
  236. err = git.NewCommand(git.DefaultContext, "hash-object", "-w", "--stdin").Run(&git.RunOpts{
  237. Dir: path,
  238. Stdin: stdin,
  239. Stdout: &stdout,
  240. })
  241. assert.NoError(t, err)
  242. sha := strings.TrimSpace(stdout.String())
  243. _, _, err = git.NewCommand(git.DefaultContext, "update-index", "--add", "--replace", "--cacheinfo").AddDynamicArguments("100644", sha, "somewher-over-the-rainbow").RunStdString(&git.RunOpts{Dir: path})
  244. assert.NoError(t, err)
  245. treeSha, _, err := git.NewCommand(git.DefaultContext, "write-tree").RunStdString(&git.RunOpts{Dir: path})
  246. assert.NoError(t, err)
  247. treeSha = strings.TrimSpace(treeSha)
  248. commitTimeStr := time.Now().Format(time.RFC3339)
  249. doerSig := user1.NewGitSig()
  250. env := append(os.Environ(),
  251. "GIT_AUTHOR_NAME="+doerSig.Name,
  252. "GIT_AUTHOR_EMAIL="+doerSig.Email,
  253. "GIT_AUTHOR_DATE="+commitTimeStr,
  254. "GIT_COMMITTER_NAME="+doerSig.Name,
  255. "GIT_COMMITTER_EMAIL="+doerSig.Email,
  256. "GIT_COMMITTER_DATE="+commitTimeStr,
  257. )
  258. messageBytes := new(bytes.Buffer)
  259. _, _ = messageBytes.WriteString("Unrelated")
  260. _, _ = messageBytes.WriteString("\n")
  261. stdout.Reset()
  262. err = git.NewCommand(git.DefaultContext, "commit-tree").AddDynamicArguments(treeSha).
  263. Run(&git.RunOpts{
  264. Env: env,
  265. Dir: path,
  266. Stdin: messageBytes,
  267. Stdout: &stdout,
  268. })
  269. assert.NoError(t, err)
  270. commitSha := strings.TrimSpace(stdout.String())
  271. _, _, err = git.NewCommand(git.DefaultContext, "branch", "unrelated").AddDynamicArguments(commitSha).RunStdString(&git.RunOpts{Dir: path})
  272. assert.NoError(t, err)
  273. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")
  274. // Use API to create a conflicting pr
  275. token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
  276. req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
  277. Head: "unrelated",
  278. Base: "base",
  279. Title: "create an unrelated pr",
  280. }).AddTokenAuth(token)
  281. session.MakeRequest(t, req, http.StatusCreated)
  282. // Now this PR could be marked conflict - or at least a race may occur - so drop down to pure code at this point...
  283. gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo1)
  284. assert.NoError(t, err)
  285. pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
  286. HeadRepoID: repo1.ID,
  287. BaseRepoID: repo1.ID,
  288. HeadBranch: "unrelated",
  289. BaseBranch: "base",
  290. })
  291. err = pull.Merge(context.Background(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "UNRELATED", false)
  292. assert.Error(t, err, "Merge should return an error due to unrelated")
  293. assert.True(t, models.IsErrMergeUnrelatedHistories(err), "Merge error is not a unrelated histories error")
  294. gitRepo.Close()
  295. })
  296. }
  297. func TestFastForwardOnlyMerge(t *testing.T) {
  298. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  299. session := loginUser(t, "user1")
  300. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  301. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "update", "README.md", "Hello, World 2\n")
  302. // Use API to create a pr from update to master
  303. token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
  304. req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
  305. Head: "update",
  306. Base: "master",
  307. Title: "create a pr that can be fast-forward-only merged",
  308. }).AddTokenAuth(token)
  309. session.MakeRequest(t, req, http.StatusCreated)
  310. user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
  311. Name: "user1",
  312. })
  313. repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
  314. OwnerID: user1.ID,
  315. Name: "repo1",
  316. })
  317. pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
  318. HeadRepoID: repo1.ID,
  319. BaseRepoID: repo1.ID,
  320. HeadBranch: "update",
  321. BaseBranch: "master",
  322. })
  323. gitRepo, err := git.OpenRepository(git.DefaultContext, repo_model.RepoPath(user1.Name, repo1.Name))
  324. assert.NoError(t, err)
  325. err = pull.Merge(context.Background(), pr, user1, gitRepo, repo_model.MergeStyleFastForwardOnly, "", "FAST-FORWARD-ONLY", false)
  326. assert.NoError(t, err)
  327. gitRepo.Close()
  328. })
  329. }
  330. func TestCantFastForwardOnlyMergeDiverging(t *testing.T) {
  331. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  332. session := loginUser(t, "user1")
  333. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  334. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "diverging", "README.md", "Hello, World diverged\n")
  335. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World 2\n")
  336. // Use API to create a pr from diverging to update
  337. token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
  338. req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
  339. Head: "diverging",
  340. Base: "master",
  341. Title: "create a pr from a diverging branch",
  342. }).AddTokenAuth(token)
  343. session.MakeRequest(t, req, http.StatusCreated)
  344. user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
  345. Name: "user1",
  346. })
  347. repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
  348. OwnerID: user1.ID,
  349. Name: "repo1",
  350. })
  351. pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
  352. HeadRepoID: repo1.ID,
  353. BaseRepoID: repo1.ID,
  354. HeadBranch: "diverging",
  355. BaseBranch: "master",
  356. })
  357. gitRepo, err := git.OpenRepository(git.DefaultContext, repo_model.RepoPath(user1.Name, repo1.Name))
  358. assert.NoError(t, err)
  359. err = pull.Merge(context.Background(), pr, user1, gitRepo, repo_model.MergeStyleFastForwardOnly, "", "DIVERGING", false)
  360. assert.Error(t, err, "Merge should return an error due to being for a diverging branch")
  361. assert.True(t, models.IsErrMergeDivergingFastForwardOnly(err), "Merge error is not a diverging fast-forward-only error")
  362. gitRepo.Close()
  363. })
  364. }
  365. func TestConflictChecking(t *testing.T) {
  366. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  367. user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
  368. // Create new clean repo to test conflict checking.
  369. baseRepo, err := repo_service.CreateRepository(db.DefaultContext, user, user, repo_service.CreateRepoOptions{
  370. Name: "conflict-checking",
  371. Description: "Tempo repo",
  372. AutoInit: true,
  373. Readme: "Default",
  374. DefaultBranch: "main",
  375. })
  376. assert.NoError(t, err)
  377. assert.NotEmpty(t, baseRepo)
  378. // create a commit on new branch.
  379. _, err = files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, user, &files_service.ChangeRepoFilesOptions{
  380. Files: []*files_service.ChangeRepoFile{
  381. {
  382. Operation: "create",
  383. TreePath: "important_file",
  384. ContentReader: strings.NewReader("Just a non-important file"),
  385. },
  386. },
  387. Message: "Add a important file",
  388. OldBranch: "main",
  389. NewBranch: "important-secrets",
  390. })
  391. assert.NoError(t, err)
  392. // create a commit on main branch.
  393. _, err = files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, user, &files_service.ChangeRepoFilesOptions{
  394. Files: []*files_service.ChangeRepoFile{
  395. {
  396. Operation: "create",
  397. TreePath: "important_file",
  398. ContentReader: strings.NewReader("Not the same content :P"),
  399. },
  400. },
  401. Message: "Add a important file",
  402. OldBranch: "main",
  403. NewBranch: "main",
  404. })
  405. assert.NoError(t, err)
  406. // create Pull to merge the important-secrets branch into main branch.
  407. pullIssue := &issues_model.Issue{
  408. RepoID: baseRepo.ID,
  409. Title: "PR with conflict!",
  410. PosterID: user.ID,
  411. Poster: user,
  412. IsPull: true,
  413. }
  414. pullRequest := &issues_model.PullRequest{
  415. HeadRepoID: baseRepo.ID,
  416. BaseRepoID: baseRepo.ID,
  417. HeadBranch: "important-secrets",
  418. BaseBranch: "main",
  419. HeadRepo: baseRepo,
  420. BaseRepo: baseRepo,
  421. Type: issues_model.PullRequestGitea,
  422. }
  423. err = pull.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
  424. assert.NoError(t, err)
  425. issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "PR with conflict!"})
  426. assert.NoError(t, issue.LoadPullRequest(db.DefaultContext))
  427. conflictingPR := issue.PullRequest
  428. // Ensure conflictedFiles is populated.
  429. assert.Len(t, conflictingPR.ConflictedFiles, 1)
  430. // Check if status is correct.
  431. assert.Equal(t, issues_model.PullRequestStatusConflict, conflictingPR.Status)
  432. // Ensure that mergeable returns false
  433. assert.False(t, conflictingPR.Mergeable(db.DefaultContext))
  434. })
  435. }
  436. func TestPullRetargetChildOnBranchDelete(t *testing.T) {
  437. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  438. session := loginUser(t, "user1")
  439. testEditFileToNewBranch(t, session, "user2", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - TestPullRetargetOnCleanup - base PR)\n")
  440. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  441. testEditFileToNewBranch(t, session, "user1", "repo1", "base-pr", "child-pr", "README.md", "Hello, World\n(Edited - TestPullRetargetOnCleanup - base PR)\n(Edited - TestPullRetargetOnCleanup - child PR)")
  442. respBasePR := testPullCreate(t, session, "user2", "repo1", true, "master", "base-pr", "Base Pull Request")
  443. elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
  444. assert.EqualValues(t, "pulls", elemBasePR[3])
  445. respChildPR := testPullCreate(t, session, "user1", "repo1", false, "base-pr", "child-pr", "Child Pull Request")
  446. elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
  447. assert.EqualValues(t, "pulls", elemChildPR[3])
  448. testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
  449. // Check child PR
  450. req := NewRequest(t, "GET", test.RedirectURL(respChildPR))
  451. resp := session.MakeRequest(t, req, http.StatusOK)
  452. htmlDoc := NewHTMLParser(t, resp.Body)
  453. targetBranch := htmlDoc.doc.Find("#branch_target>a").Text()
  454. prStatus := strings.TrimSpace(htmlDoc.doc.Find(".issue-title-meta>.issue-state-label").Text())
  455. assert.EqualValues(t, "master", targetBranch)
  456. assert.EqualValues(t, "Open", prStatus)
  457. })
  458. }
  459. func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
  460. onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
  461. session := loginUser(t, "user1")
  462. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  463. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - TestPullDontRetargetChildOnWrongRepo - base PR)\n")
  464. testEditFileToNewBranch(t, session, "user1", "repo1", "base-pr", "child-pr", "README.md", "Hello, World\n(Edited - TestPullDontRetargetChildOnWrongRepo - base PR)\n(Edited - TestPullDontRetargetChildOnWrongRepo - child PR)")
  465. respBasePR := testPullCreate(t, session, "user1", "repo1", false, "master", "base-pr", "Base Pull Request")
  466. elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
  467. assert.EqualValues(t, "pulls", elemBasePR[3])
  468. respChildPR := testPullCreate(t, session, "user1", "repo1", true, "base-pr", "child-pr", "Child Pull Request")
  469. elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
  470. assert.EqualValues(t, "pulls", elemChildPR[3])
  471. testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
  472. // Check child PR
  473. req := NewRequest(t, "GET", test.RedirectURL(respChildPR))
  474. resp := session.MakeRequest(t, req, http.StatusOK)
  475. htmlDoc := NewHTMLParser(t, resp.Body)
  476. targetBranch := htmlDoc.doc.Find("#branch_target>a").Text()
  477. prStatus := strings.TrimSpace(htmlDoc.doc.Find(".issue-title-meta>.issue-state-label").Text())
  478. assert.EqualValues(t, "base-pr", targetBranch)
  479. assert.EqualValues(t, "Closed", prStatus)
  480. })
  481. }