[MODERATION] User blocking (squash) do not use shared fixture
It conflicts with a fixtured added in the commit Fix comment permissions (#28213) (#28216)
This commit is contained in:
parent
84f8a8292e
commit
e672322ca8
3 changed files with 11 additions and 10 deletions
|
@ -66,12 +66,3 @@
|
||||||
tree_path: "README.md"
|
tree_path: "README.md"
|
||||||
created_unix: 946684812
|
created_unix: 946684812
|
||||||
invalidated: true
|
invalidated: true
|
||||||
|
|
||||||
-
|
|
||||||
id: 8
|
|
||||||
type: 0 # comment
|
|
||||||
poster_id: 2
|
|
||||||
issue_id: 4 # in repo_id 2
|
|
||||||
content: "I just wanted to add.."
|
|
||||||
created_unix: 946684812
|
|
||||||
updated_unix: 946684812
|
|
||||||
|
|
|
@ -158,6 +158,7 @@ func TestBlockUserFromOrganization(t *testing.T) {
|
||||||
// and as a blocked user and are handled cleanly after the blocking has taken
|
// and as a blocked user and are handled cleanly after the blocking has taken
|
||||||
// place.
|
// place.
|
||||||
func TestBlockActions(t *testing.T) {
|
func TestBlockActions(t *testing.T) {
|
||||||
|
defer tests.AddFixtures("tests/integration/fixtures/TestBlockActions/")()
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
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) {
|
t.Run("On a comment", func(t *testing.T) {
|
||||||
defer tests.PrintCurrentTest(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)
|
session := loginUser(t, blockedUser.Name)
|
||||||
|
|
||||||
|
|
9
tests/integration/fixtures/TestBlockActions/comment.yml
Normal file
9
tests/integration/fixtures/TestBlockActions/comment.yml
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
|
||||||
|
-
|
||||||
|
id: 1008
|
||||||
|
type: 0 # comment
|
||||||
|
poster_id: 2
|
||||||
|
issue_id: 4 # in repo_id 2
|
||||||
|
content: "comment in private pository"
|
||||||
|
created_unix: 946684811
|
||||||
|
updated_unix: 946684811
|
Loading…
Reference in a new issue