mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-29 22:06:06 +02:00
Ensure review dismissal only dismisses the correct review (#15477)
Fix #15472 Signed-off-by: Andrew Thornton art27@cantab.net
This commit is contained in:
parent
61bae620c1
commit
9d07facdeb
2 changed files with 58 additions and 8 deletions
|
@ -566,7 +566,11 @@ func DismissReview(review *Review, isDismiss bool) (err error) {
|
||||||
|
|
||||||
review.Dismissed = isDismiss
|
review.Dismissed = isDismiss
|
||||||
|
|
||||||
_, err = x.Cols("dismissed").Update(review)
|
if review.ID == 0 {
|
||||||
|
return ErrReviewNotExist{}
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = x.ID(review.ID).Cols("dismissed").Update(review)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,11 +143,57 @@ func TestGetReviewersByIssueID(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDismissReview(t *testing.T) {
|
func TestDismissReview(t *testing.T) {
|
||||||
review1 := AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
assert.NoError(t, PrepareTestDatabase())
|
||||||
review2 := AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
|
||||||
assert.NoError(t, DismissReview(review1, true))
|
rejectReviewExample := AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
||||||
assert.NoError(t, DismissReview(review2, true))
|
requestReviewExample := AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
||||||
assert.NoError(t, DismissReview(review2, true))
|
approveReviewExample := AssertExistsAndLoadBean(t, &Review{ID: 8}).(*Review)
|
||||||
assert.NoError(t, DismissReview(review2, false))
|
assert.False(t, rejectReviewExample.Dismissed)
|
||||||
assert.NoError(t, DismissReview(review2, false))
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.False(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(rejectReviewExample, true))
|
||||||
|
rejectReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
||||||
|
requestReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
||||||
|
assert.True(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(requestReviewExample, true))
|
||||||
|
rejectReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
||||||
|
requestReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
||||||
|
assert.True(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.False(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(requestReviewExample, true))
|
||||||
|
rejectReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
||||||
|
requestReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
||||||
|
assert.True(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.False(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(requestReviewExample, false))
|
||||||
|
rejectReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
||||||
|
requestReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
||||||
|
assert.True(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.False(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(requestReviewExample, false))
|
||||||
|
rejectReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 9}).(*Review)
|
||||||
|
requestReviewExample = AssertExistsAndLoadBean(t, &Review{ID: 11}).(*Review)
|
||||||
|
assert.True(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.False(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(rejectReviewExample, false))
|
||||||
|
assert.False(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.False(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
|
assert.NoError(t, DismissReview(approveReviewExample, true))
|
||||||
|
assert.False(t, rejectReviewExample.Dismissed)
|
||||||
|
assert.False(t, requestReviewExample.Dismissed)
|
||||||
|
assert.True(t, approveReviewExample.Dismissed)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue