You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

pull_merge_test.go 3.2 kB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596
  1. // Copyright 2017 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/http/httptest"
  8. "path"
  9. "strings"
  10. "testing"
  11. "code.gitea.io/gitea/modules/test"
  12. "github.com/stretchr/testify/assert"
  13. )
  14. func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder {
  15. req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
  16. resp := session.MakeRequest(t, req, http.StatusOK)
  17. // Click the little green button to create a pull
  18. htmlDoc := NewHTMLParser(t, resp.Body)
  19. link, exists := htmlDoc.doc.Find("form.ui.form>button.ui.green.button").Parent().Attr("action")
  20. assert.True(t, exists, "The template has changed")
  21. req = NewRequestWithValues(t, "POST", link, map[string]string{
  22. "_csrf": htmlDoc.GetCSRF(),
  23. })
  24. resp = session.MakeRequest(t, req, http.StatusFound)
  25. return resp
  26. }
  27. func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder {
  28. req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
  29. resp := session.MakeRequest(t, req, http.StatusOK)
  30. // Click the little green button to create a pull
  31. htmlDoc := NewHTMLParser(t, resp.Body)
  32. link, exists := htmlDoc.doc.Find(".comments .merge .delete-button").Attr("data-url")
  33. assert.True(t, exists, "The template has changed")
  34. req = NewRequestWithValues(t, "POST", link, map[string]string{
  35. "_csrf": htmlDoc.GetCSRF(),
  36. })
  37. resp = session.MakeRequest(t, req, http.StatusOK)
  38. return resp
  39. }
  40. func TestPullMerge(t *testing.T) {
  41. prepareTestEnv(t)
  42. session := loginUser(t, "user1")
  43. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  44. testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
  45. resp := testPullCreate(t, session, "user1", "repo1", "master")
  46. elem := strings.Split(test.RedirectURL(resp), "/")
  47. assert.EqualValues(t, "pulls", elem[3])
  48. testPullMerge(t, session, elem[1], elem[2], elem[4])
  49. }
  50. func TestPullCleanUpAfterMerge(t *testing.T) {
  51. prepareTestEnv(t)
  52. session := loginUser(t, "user1")
  53. testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
  54. testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n")
  55. resp := testPullCreate(t, session, "user1", "repo1", "feature/test")
  56. elem := strings.Split(test.RedirectURL(resp), "/")
  57. assert.EqualValues(t, "pulls", elem[3])
  58. testPullMerge(t, session, elem[1], elem[2], elem[4])
  59. // Check PR branch deletion
  60. resp = testPullCleanUp(t, session, elem[1], elem[2], elem[4])
  61. respJSON := struct {
  62. Redirect string
  63. }{}
  64. DecodeJSON(t, resp, &respJSON)
  65. assert.NotEmpty(t, respJSON.Redirect, "Redirected URL is not found")
  66. elem = strings.Split(respJSON.Redirect, "/")
  67. assert.EqualValues(t, "pulls", elem[3])
  68. // Check branch deletion result
  69. req := NewRequest(t, "GET", respJSON.Redirect)
  70. resp = session.MakeRequest(t, req, http.StatusOK)
  71. htmlDoc := NewHTMLParser(t, resp.Body)
  72. resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
  73. assert.EqualValues(t, "user1/feature/test has been deleted.", resultMsg)
  74. }