diff options
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index b4a3397a45..867817c2c2 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -17,6 +17,7 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/git" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" @@ -219,15 +220,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 := models.AssertExistsAndLoadBean(t, &models.User{ + user1 := db.AssertExistsAndLoadBean(t, &models.User{ Name: "user1", }).(*models.User) - repo1 := models.AssertExistsAndLoadBean(t, &models.Repository{ + repo1 := db.AssertExistsAndLoadBean(t, &models.Repository{ OwnerID: user1.ID, Name: "repo1", }).(*models.Repository) - pr := models.AssertExistsAndLoadBean(t, &models.PullRequest{ + pr := db.AssertExistsAndLoadBean(t, &models.PullRequest{ HeadRepoID: repo1.ID, BaseRepoID: repo1.ID, HeadBranch: "conflict", @@ -256,10 +257,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 := models.AssertExistsAndLoadBean(t, &models.User{ + user1 := db.AssertExistsAndLoadBean(t, &models.User{ Name: "user1", }).(*models.User) - repo1 := models.AssertExistsAndLoadBean(t, &models.Repository{ + repo1 := db.AssertExistsAndLoadBean(t, &models.Repository{ OwnerID: user1.ID, Name: "repo1", }).(*models.Repository) @@ -318,7 +319,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 := models.AssertExistsAndLoadBean(t, &models.PullRequest{ + pr := db.AssertExistsAndLoadBean(t, &models.PullRequest{ HeadRepoID: repo1.ID, BaseRepoID: repo1.ID, HeadBranch: "unrelated", |