mirror of
https://github.com/go-gitea/gitea
synced 2024-11-05 08:57:06 +01:00
daf2a4c047
There's a bug in #25715: If user pushed a commit into another repo with same branch name, the no-related repo will display the recently pushed notification incorrectly. It is simple to fix this, we should match the repo id in the sql query. ![image](https://github.com/go-gitea/gitea/assets/18380374/9411a926-16f1-419e-a1b5-e953af38bab1) The latest commit is 2 weeks ago. ![image](https://github.com/go-gitea/gitea/assets/18380374/52f9ab22-4999-43ac-a86f-6d36fb1e0411) The notification comes from another repo with same branch name: ![image](https://github.com/go-gitea/gitea/assets/18380374/a26bc335-8e5b-4b9c-a965-c3dc3fa6f252) After: In forked repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/ce6ffc35-deb7-4be7-8b09-184207392f32) New PR Link will redirect to the original repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/7b98e76f-0c75-494c-9462-80cf9f98e786) In the original repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/5f6a821b-e51a-4bbd-9980-d9eb94a3c847) New PR Link: ![image](https://github.com/go-gitea/gitea/assets/18380374/1ce8c879-9f11-4312-8c32-695d7d9af0df) In the same repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/64b56073-4d0e-40c4-b8a0-80be7a775f69) New PR Link: ![image](https://github.com/go-gitea/gitea/assets/18380374/96e1b6a3-fb98-40ee-b2ee-648039fb0dcf) 08/15 Update: Follow #26257, added permission check and logic fix mentioned in https://github.com/go-gitea/gitea/pull/26257#discussion_r1294085203 2024/04/25 Update: Fix #30611 --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
168 lines
5.9 KiB
Go
168 lines
5.9 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"path"
|
|
"strings"
|
|
"testing"
|
|
|
|
auth_model "code.gitea.io/gitea/models/auth"
|
|
git_model "code.gitea.io/gitea/models/git"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestPullCreate_CommitStatus(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
session := loginUser(t, "user1")
|
|
testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
|
|
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "status1", "README.md", "status1")
|
|
|
|
url := path.Join("user1", "repo1", "compare", "master...status1")
|
|
req := NewRequestWithValues(t, "POST", url,
|
|
map[string]string{
|
|
"_csrf": GetCSRF(t, session, url),
|
|
"title": "pull request from status1",
|
|
},
|
|
)
|
|
session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
NewHTMLParser(t, resp.Body)
|
|
|
|
// Request repository commits page
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1/commits")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
|
|
// Get first commit URL
|
|
commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
|
|
assert.True(t, exists)
|
|
assert.NotEmpty(t, commitURL)
|
|
|
|
commitID := path.Base(commitURL)
|
|
|
|
statusList := []api.CommitStatusState{
|
|
api.CommitStatusPending,
|
|
api.CommitStatusError,
|
|
api.CommitStatusFailure,
|
|
api.CommitStatusSuccess,
|
|
api.CommitStatusWarning,
|
|
}
|
|
|
|
statesIcons := map[api.CommitStatusState]string{
|
|
api.CommitStatusPending: "octicon-dot-fill",
|
|
api.CommitStatusSuccess: "octicon-check",
|
|
api.CommitStatusError: "gitea-exclamation",
|
|
api.CommitStatusFailure: "octicon-x",
|
|
api.CommitStatusWarning: "gitea-exclamation",
|
|
}
|
|
|
|
testCtx := NewAPITestContext(t, "user1", "repo1", auth_model.AccessTokenScopeWriteRepository)
|
|
|
|
// Update commit status, and check if icon is updated as well
|
|
for _, status := range statusList {
|
|
// Call API to add status for commit
|
|
t.Run("CreateStatus", doAPICreateCommitStatus(testCtx, commitID, api.CreateStatusOption{
|
|
State: status,
|
|
TargetURL: "http://test.ci/",
|
|
Description: "",
|
|
Context: "testci",
|
|
}))
|
|
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1/commits")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
doc = NewHTMLParser(t, resp.Body)
|
|
|
|
commitURL, exists = doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
|
|
assert.True(t, exists)
|
|
assert.NotEmpty(t, commitURL)
|
|
assert.EqualValues(t, commitID, path.Base(commitURL))
|
|
|
|
cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
|
|
assert.True(t, ok)
|
|
assert.Contains(t, cls, statesIcons[status])
|
|
}
|
|
|
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
|
|
css := unittest.AssertExistsAndLoadBean(t, &git_model.CommitStatusSummary{RepoID: repo1.ID, SHA: commitID})
|
|
assert.EqualValues(t, api.CommitStatusWarning, css.State)
|
|
})
|
|
}
|
|
|
|
func doAPICreateCommitStatus(ctx APITestContext, commitID string, data api.CreateStatusOption) func(*testing.T) {
|
|
return func(t *testing.T) {
|
|
req := NewRequestWithJSON(
|
|
t,
|
|
http.MethodPost,
|
|
fmt.Sprintf("/api/v1/repos/%s/%s/statuses/%s", ctx.Username, ctx.Reponame, commitID),
|
|
data,
|
|
).AddTokenAuth(ctx.Token)
|
|
if ctx.ExpectedCode != 0 {
|
|
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
|
|
return
|
|
}
|
|
ctx.Session.MakeRequest(t, req, http.StatusCreated)
|
|
}
|
|
}
|
|
|
|
func TestPullCreate_EmptyChangesWithDifferentCommits(t *testing.T) {
|
|
// Merge must continue if commits SHA are different, even if content is same
|
|
// Reason: gitflow and merging master back into develop, where is high possibility, there are no changes
|
|
// but just commit saying "Merge branch". And this meta commit can be also tagged,
|
|
// so we need to have this meta commit also in develop branch.
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
session := loginUser(t, "user1")
|
|
testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
|
|
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "status1", "README.md", "status1")
|
|
testEditFileToNewBranch(t, session, "user1", "repo1", "status1", "status1", "README.md", "# repo1\n\nDescription for repo1")
|
|
|
|
url := path.Join("user1", "repo1", "compare", "master...status1")
|
|
req := NewRequestWithValues(t, "POST", url,
|
|
map[string]string{
|
|
"_csrf": GetCSRF(t, session, url),
|
|
"title": "pull request from status1",
|
|
},
|
|
)
|
|
session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
|
|
text := strings.TrimSpace(doc.doc.Find(".merge-section").Text())
|
|
assert.Contains(t, text, "This pull request can be merged automatically.")
|
|
})
|
|
}
|
|
|
|
func TestPullCreate_EmptyChangesWithSameCommits(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
session := loginUser(t, "user1")
|
|
testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
|
|
testCreateBranch(t, session, "user1", "repo1", "branch/master", "status1", http.StatusSeeOther)
|
|
url := path.Join("user1", "repo1", "compare", "master...status1")
|
|
req := NewRequestWithValues(t, "POST", url,
|
|
map[string]string{
|
|
"_csrf": GetCSRF(t, session, url),
|
|
"title": "pull request from status1",
|
|
},
|
|
)
|
|
session.MakeRequest(t, req, http.StatusOK)
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
|
|
text := strings.TrimSpace(doc.doc.Find(".merge-section").Text())
|
|
assert.Contains(t, text, "This branch is already included in the target branch. There is nothing to merge.")
|
|
})
|
|
}
|