Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Get repo assignees and reviewers should ignore deactivated users #30770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 30, 2024
Merged

Get repo assignees and reviewers should ignore deactivated users #30770

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f328a1d
add test against deactivated user for GetRepoAssignees
6543 Apr 29, 2024
d71562e
add test against deactivated user for GetReviewers
6543 Apr 29, 2024
cca8c14
User Suggestion for Assignees and Reviewers must be activated
6543 Apr 29, 2024
3df91cd
user9 in fixtures was already inactive
6543 Apr 29, 2024
16f797b
correct tests
6543 Apr 29, 2024
6fef0b7
re-add unwanted rm
6543 Apr 30, 2024
91011c4
adjust TestAPIRepoGetReviewers too
6543 Apr 30, 2024
b1d9b2b
Merge branch 'main' into upstream_GetRepo_Assignees-Reviewers_only-ac…
6543 Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
user9 in fixtures was already inactive
  • Loading branch information
@6543
6543 committed Apr 29, 2024
commit 3df91cd62d24799f9d233965d8c2a086354b63af
18 changes: 4 additions & 14 deletions models/repo/user_repo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ func TestRepoGetReviewers(t *testing.T) {
ctx := db.DefaultContext
reviewers, err := repo_model.GetReviewers(ctx, repo1, 2, 2)
assert.NoError(t, err)
if assert.Len(t, reviewers, 4) {
assert.ElementsMatch(t, []int64{1, 4, 9, 11}, []int64{reviewers[0].ID, reviewers[1].ID, reviewers[2].ID, reviewers[3].ID})
if assert.Len(t, reviewers, 3) {
assert.ElementsMatch(t, []int64{1, 4, 11}, []int64{reviewers[0].ID, reviewers[1].ID, reviewers[2].ID})
}

// 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)
assert.Len(t, reviewers, 3)

// 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)
assert.Len(t, reviewers, 2)

// test private user repo
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
Expand All @@ -81,14 +81,4 @@ func TestRepoGetReviewers(t *testing.T) {

reviewers, err = repo_model.GetReviewers(ctx, repo3, 2, 2)
assert.NoError(t, err)
assert.Len(t, reviewers, 1)

// do not return deactivated users
user11 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 11})
user_model.UpdateUserCols(db.DefaultContext, user11, "is_active")
reviewers, err = repo_model.GetReviewers(ctx, repo1, 2, 2)
assert.NoError(t, err)
if assert.Len(t, reviewers, 3) {
assert.NotContains(t, []int64{reviewers[0].ID, reviewers[1].ID, reviewers[2].ID}, 11)
}
}