b1f3069a22
- Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421) (cherry picked from commit37b4e6ef9b) (cherry picked from commitc17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c) (cherry picked from commit4743eaa6a0) (cherry picked from commiteff5b43d2e) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit9d359be5ed)
86 lines
2.6 KiB
Go
86 lines
2.6 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestRepoAssignees(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
|
users, err := repo_model.GetRepoAssignees(db.DefaultContext, repo2)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, users, 1)
|
|
assert.Equal(t, users[0].ID, int64(2))
|
|
|
|
repo21 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 21})
|
|
users, err = repo_model.GetRepoAssignees(db.DefaultContext, repo21)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, users, 3)
|
|
assert.Equal(t, users[0].ID, int64(15))
|
|
assert.Equal(t, users[1].ID, int64(18))
|
|
assert.Equal(t, users[2].ID, int64(16))
|
|
}
|
|
|
|
func TestRepoGetReviewers(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
// test public repo
|
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
|
|
ctx := db.DefaultContext
|
|
reviewers, err := repo_model.GetReviewers(ctx, repo1, 2, 2)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, reviewers, 4)
|
|
|
|
// should include doer if doer is not PR poster.
|
|
reviewers, err = repo_model.GetReviewers(ctx, repo1, 11, 2)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, reviewers, 4)
|
|
|
|
// should not include PR poster, if PR poster would be otherwise eligible
|
|
reviewers, err = repo_model.GetReviewers(ctx, repo1, 11, 4)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, reviewers, 3)
|
|
|
|
// test private user repo
|
|
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
|
|
|
reviewers, err = repo_model.GetReviewers(ctx, repo2, 2, 4)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, reviewers, 1)
|
|
assert.EqualValues(t, reviewers[0].ID, 2)
|
|
|
|
// test private org repo
|
|
repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
|
|
|
|
reviewers, err = repo_model.GetReviewers(ctx, repo3, 2, 1)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, reviewers, 2)
|
|
|
|
reviewers, err = repo_model.GetReviewers(ctx, repo3, 2, 2)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, reviewers, 1)
|
|
}
|
|
|
|
func GetWatchedRepoIDsOwnedBy(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 9})
|
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
|
|
repoIDs, err := repo_model.GetWatchedRepoIDsOwnedBy(db.DefaultContext, user1.ID, user2.ID)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, repoIDs, 1)
|
|
assert.EqualValues(t, 1, repoIDs[0])
|
|
}
|