diff options
Diffstat (limited to 'integrations/gpg_git_test.go')
| -rw-r--r-- | integrations/gpg_git_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/integrations/gpg_git_test.go b/integrations/gpg_git_test.go index b136e82281..8478f53c0e 100644 --- a/integrations/gpg_git_test.go +++ b/integrations/gpg_git_test.go @@ -11,8 +11,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" @@ -61,7 +61,7 @@ func TestGPGGit(t *testing.T) { setting.Repository.Signing.SigningKey = rootKeyID setting.Repository.Signing.SigningName = "gitea" setting.Repository.Signing.SigningEmail = "gitea@fake.local" - user := unittest.AssertExistsAndLoadBean(t, &models.User{Name: username}).(*models.User) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: username}).(*user_model.User) setting.Repository.Signing.InitialCommit = []string{"never"} setting.Repository.Signing.CRUDActions = []string{"never"} @@ -326,7 +326,7 @@ func TestGPGGit(t *testing.T) { }, false) } -func crudActionCreateFile(t *testing.T, ctx APITestContext, user *models.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { +func crudActionCreateFile(t *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { return doAPICreateFile(ctx, path, &api.CreateFileOptions{ FileOptions: api.FileOptions{ BranchName: from, |