mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-06-28 12:54:49 +02:00
cdf6318f51
- 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 commit217475385a) (cherry picked from commitf2c38ce5c2) (cherry picked from commit1edfb68137) (cherry picked from commit2cbc12dc74) (cherry picked from commit79ff020f18)
42 lines
1.5 KiB
Go
42 lines
1.5 KiB
Go
// Copyright 2023 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
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"
|
|
)
|
|
|
|
// TestBlockUser will ensure that when you block a user, certain actions have
|
|
// been taken, like unfollowing each other etc.
|
|
func TestBlockUser(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
|
blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
|
|
// Follow each other.
|
|
assert.NoError(t, user_model.FollowUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
|
assert.NoError(t, user_model.FollowUser(db.DefaultContext, blockedUser.ID, doer.ID))
|
|
|
|
// Blocked user watch repository of doer.
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: doer.ID})
|
|
assert.NoError(t, repo_model.WatchRepo(db.DefaultContext, blockedUser.ID, repo.ID, true))
|
|
|
|
assert.NoError(t, BlockUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
|
|
|
// Ensure they aren't following each other anymore.
|
|
assert.False(t, user_model.IsFollowing(doer.ID, blockedUser.ID))
|
|
assert.False(t, user_model.IsFollowing(blockedUser.ID, doer.ID))
|
|
|
|
// Ensure blocked user isn't following doer's repository.
|
|
assert.False(t, repo_model.IsWatching(blockedUser.ID, repo.ID))
|
|
}
|