From 2227f71471e34df0fc3153f6aa2e28ac0177e89e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 16 Mar 2024 17:59:09 +0800 Subject: [PATCH 1/2] Fix wrong test repo id --- tests/integration/pull_review_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 7166a740ab148..97bffe34a7f39 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -139,7 +139,7 @@ func TestPullView_CodeOwner(t *testing.T) { session := loginUser(t, "user5") testPullCreate(t, session, "user5", "test_codeowner_fork", false, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2") - pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "codeowner-basebranch-forked"}) + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"}) unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8}) }) }) From b1eac59d9436c6ab9db7ca86ff52b5c4c63f1345 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 16 Mar 2024 19:38:11 +0800 Subject: [PATCH 2/2] Fix wrong test for TestPullView_CodeOwner --- tests/integration/pull_review_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 97bffe34a7f39..459aa5a58b183 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -119,7 +119,7 @@ func TestPullView_CodeOwner(t *testing.T) { user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) forkedRepo, err := repo_service.ForkRepository(db.DefaultContext, user2, user5, repo_service.ForkRepoOptions{ BaseRepo: repo, - Name: "test_codeowner_fork", + Name: "test_codeowner", }) assert.NoError(t, err) @@ -137,7 +137,7 @@ func TestPullView_CodeOwner(t *testing.T) { assert.NoError(t, err) session := loginUser(t, "user5") - testPullCreate(t, session, "user5", "test_codeowner_fork", false, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2") + testPullCreate(t, session, "user5", "test_codeowner", true, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2") pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"}) unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})