diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2021-11-16 16:53:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 16:53:21 +0800 |
| commit | 81926d61db3dac223a75ea49eab893b25a089587 (patch) | |
| tree | 627d2f19a008089f3a688e9a94a2cc8d2017afe2 /integrations/pull_merge_test.go | |
| parent | 23bd7b1211a80aa3b0dcb60ec4a1c0089ff28dd4 (diff) | |
| download | gitea-81926d61db3dac223a75ea49eab893b25a089587.tar.gz gitea-81926d61db3dac223a75ea49eab893b25a089587.zip | |
Decouple unit test, remove intermediate `unittestbridge` package (#17662)
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index 9ccc4043a0..4d5699fa53 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -17,7 +17,7 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/git" api "code.gitea.io/gitea/modules/structs" @@ -221,15 +221,15 @@ func TestCantMergeConflict(t *testing.T) { session.MakeRequest(t, req, 201) // Now this PR will be marked conflict - or at least a race will do - so drop down to pure code at this point... - user1 := db.AssertExistsAndLoadBean(t, &models.User{ + user1 := unittest.AssertExistsAndLoadBean(t, &models.User{ Name: "user1", }).(*models.User) - repo1 := db.AssertExistsAndLoadBean(t, &models.Repository{ + repo1 := unittest.AssertExistsAndLoadBean(t, &models.Repository{ OwnerID: user1.ID, Name: "repo1", }).(*models.Repository) - pr := db.AssertExistsAndLoadBean(t, &models.PullRequest{ + pr := unittest.AssertExistsAndLoadBean(t, &models.PullRequest{ HeadRepoID: repo1.ID, BaseRepoID: repo1.ID, HeadBranch: "conflict", @@ -258,10 +258,10 @@ func TestCantMergeUnrelated(t *testing.T) { // Now we want to create a commit on a branch that is totally unrelated to our current head // Drop down to pure code at this point - user1 := db.AssertExistsAndLoadBean(t, &models.User{ + user1 := unittest.AssertExistsAndLoadBean(t, &models.User{ Name: "user1", }).(*models.User) - repo1 := db.AssertExistsAndLoadBean(t, &models.Repository{ + repo1 := unittest.AssertExistsAndLoadBean(t, &models.Repository{ OwnerID: user1.ID, Name: "repo1", }).(*models.Repository) @@ -320,7 +320,7 @@ func TestCantMergeUnrelated(t *testing.T) { // Now this PR could be marked conflict - or at least a race may occur - so drop down to pure code at this point... gitRepo, err := git.OpenRepository(path) assert.NoError(t, err) - pr := db.AssertExistsAndLoadBean(t, &models.PullRequest{ + pr := unittest.AssertExistsAndLoadBean(t, &models.PullRequest{ HeadRepoID: repo1.ID, BaseRepoID: repo1.ID, HeadBranch: "unrelated", |