mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Remove incorrect "db.DefaultContext" usages (#35366)
This commit is contained in:
		| @@ -6,7 +6,6 @@ package pull_test | ||||
| import ( | ||||
| 	"testing" | ||||
|  | ||||
| 	"code.gitea.io/gitea/models/db" | ||||
| 	issues_model "code.gitea.io/gitea/models/issues" | ||||
| 	"code.gitea.io/gitea/models/unittest" | ||||
| 	user_model "code.gitea.io/gitea/models/user" | ||||
| @@ -19,11 +18,11 @@ func TestDismissReview(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{}) | ||||
| 	assert.NoError(t, pull.LoadIssue(db.DefaultContext)) | ||||
| 	assert.NoError(t, pull.LoadIssue(t.Context())) | ||||
| 	issue := pull.Issue | ||||
| 	assert.NoError(t, issue.LoadRepo(db.DefaultContext)) | ||||
| 	assert.NoError(t, issue.LoadRepo(t.Context())) | ||||
| 	reviewer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) | ||||
| 	review, err := issues_model.CreateReview(db.DefaultContext, issues_model.CreateReviewOptions{ | ||||
| 	review, err := issues_model.CreateReview(t.Context(), issues_model.CreateReviewOptions{ | ||||
| 		Issue:    issue, | ||||
| 		Reviewer: reviewer, | ||||
| 		Type:     issues_model.ReviewTypeReject, | ||||
| @@ -32,17 +31,17 @@ func TestDismissReview(t *testing.T) { | ||||
| 	assert.NoError(t, err) | ||||
| 	issue.IsClosed = true | ||||
| 	pull.HasMerged = false | ||||
| 	assert.NoError(t, issues_model.UpdateIssueCols(db.DefaultContext, issue, "is_closed")) | ||||
| 	assert.NoError(t, pull.UpdateCols(db.DefaultContext, "has_merged")) | ||||
| 	_, err = pull_service.DismissReview(db.DefaultContext, review.ID, issue.RepoID, "", &user_model.User{}, false, false) | ||||
| 	assert.NoError(t, issues_model.UpdateIssueCols(t.Context(), issue, "is_closed")) | ||||
| 	assert.NoError(t, pull.UpdateCols(t.Context(), "has_merged")) | ||||
| 	_, err = pull_service.DismissReview(t.Context(), review.ID, issue.RepoID, "", &user_model.User{}, false, false) | ||||
| 	assert.Error(t, err) | ||||
| 	assert.True(t, pull_service.IsErrDismissRequestOnClosedPR(err)) | ||||
|  | ||||
| 	pull.HasMerged = true | ||||
| 	pull.Issue.IsClosed = false | ||||
| 	assert.NoError(t, issues_model.UpdateIssueCols(db.DefaultContext, issue, "is_closed")) | ||||
| 	assert.NoError(t, pull.UpdateCols(db.DefaultContext, "has_merged")) | ||||
| 	_, err = pull_service.DismissReview(db.DefaultContext, review.ID, issue.RepoID, "", &user_model.User{}, false, false) | ||||
| 	assert.NoError(t, issues_model.UpdateIssueCols(t.Context(), issue, "is_closed")) | ||||
| 	assert.NoError(t, pull.UpdateCols(t.Context(), "has_merged")) | ||||
| 	_, err = pull_service.DismissReview(t.Context(), review.ID, issue.RepoID, "", &user_model.User{}, false, false) | ||||
| 	assert.Error(t, err) | ||||
| 	assert.True(t, pull_service.IsErrDismissRequestOnClosedPR(err)) | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user