domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

[MODERATION] User blocking (squash) do not use shared fixture

Browse source 
It conflicts with a fixtured added in the commit
Fix comment permissions (#28213) (#28216)
This commit is contained in:
Earl Warren 2023-11-26 13:51:49 +01:00
parent 84f8a8292e
commit e672322ca8
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/integration/block_test.go
View file

@ -158,6 +158,7 @@ func TestBlockUserFromOrganization(t *testing.T) {
// and as a blocked user and are handled cleanly after the blocking has taken
// place.
func TestBlockActions(t *testing.T) {
defer tests.AddFixtures("tests/integration/fixtures/TestBlockActions/")()
defer tests.PrepareTestEnv(t)()
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
@ -264,7 +265,7 @@ func TestBlockActions(t *testing.T) {
t.Run("On a comment", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
comment := unittest.AssertExistsAndLoadBean(t, &issue_model.Comment{ID: 8, PosterID: doer.ID, IssueID: issue4.ID})
comment := unittest.AssertExistsAndLoadBean(t, &issue_model.Comment{ID: 1008, PosterID: doer.ID, IssueID: issue4.ID})
session := loginUser(t, blockedUser.Name)