diff options
Diffstat (limited to 'integrations/repo_activity_test.go')
| -rw-r--r-- | integrations/repo_activity_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/integrations/repo_activity_test.go b/integrations/repo_activity_test.go index 56b70c9595..66cc8dcfe2 100644 --- a/integrations/repo_activity_test.go +++ b/integrations/repo_activity_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/test" "github.com/stretchr/testify/assert" @@ -27,7 +27,7 @@ func TestRepoActivity(t *testing.T) { resp := testPullCreate(t, session, "user1", "repo1", "master", "This is a pull title") elem := strings.Split(test.RedirectURL(resp), "/") assert.EqualValues(t, "pulls", elem[3]) - testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleMerge) + testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge) testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feat/better_readme", "README.md", "Hello, World (Edited Again)\n") testPullCreate(t, session, "user1", "repo1", "feat/better_readme", "This is a pull title") |