mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-05-26 04:49:30 +02:00
Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v2 (forgejo) (#7367)
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org> Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
This commit is contained in:
parent
51ff4970ec
commit
fed2d81c44
427 changed files with 2043 additions and 2046 deletions
|
@ -539,16 +539,16 @@ func TestRecentlyPushed(t *testing.T) {
|
|||
|
||||
respChildPR := testPullCreateDirectly(t, session, "user2", "repo1", "master", "user1", "repo1", "recent-push", "Child Pull Request")
|
||||
elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
|
||||
assert.EqualValues(t, "user2", elemChildPR[1])
|
||||
assert.EqualValues(t, "repo1", elemChildPR[2])
|
||||
assert.EqualValues(t, "pulls", elemChildPR[3])
|
||||
assert.Equal(t, "user2", elemChildPR[1])
|
||||
assert.Equal(t, "repo1", elemChildPR[2])
|
||||
assert.Equal(t, "pulls", elemChildPR[3])
|
||||
session2 := loginUser(t, "user2")
|
||||
// Merge the PR from the fork
|
||||
testPullMerge(t, session2, elemChildPR[1], elemChildPR[2], elemChildPR[4], repo_model.MergeStyleSquash, false)
|
||||
|
||||
respBasePR := testPullCreate(t, session, "user2", "repo1", true, "master", "recent-push-base", "Base Pull Request")
|
||||
elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
|
||||
assert.EqualValues(t, "pulls", elemBasePR[3])
|
||||
assert.Equal(t, "pulls", elemBasePR[3])
|
||||
// Leave the PR from the base repo open (it conflicts with the PR from the fork anyway)
|
||||
|
||||
// Count recently pushed branches on the base repo
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue