fix test

Author: lunny

integrations/api_repo_test.go

@@ -334,7 +334,7 @@ func testAPIRepoMigrateConflict(t *testing.T, u *url.URL) {
 		resp := httpContext.Session.MakeRequest(t, req, http.StatusConflict)
 		respJSON := map[string]string{}
 		DecodeJSON(t, resp, &respJSON)
-		assert.Equal(t, "repository already exists [uname: user2, name: repo-tmp-17]", respJSON["message"])
+		assert.Equal(t, "The repository with the same name already exists.", respJSON["message"])
 	})
 }
 

routers/api/v1/repo/repo.go

@@ -436,7 +436,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
 		Status:      models.RepositoryBeingMigrated,
 	})
 	if err != nil {
-		ctx.Error(500, "CreateRepository", err)
+		handleMigrateError(ctx, remoteAddr, err)
 		return
 	}
 
@@ -472,6 +472,10 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
 		return
 	}
 
+	handleMigrateError(ctx, remoteAddr, err)
+}
+
+func handleMigrateError(ctx *context.APIContext, remoteAddr string, err error) {
 	switch {
 	case models.IsErrRepoAlreadyExist(err):
 		ctx.Error(409, "", "The repository with the same name already exists.")
@@ -480,7 +484,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
 	case migrations.IsTwoFactorAuthError(err):
 		ctx.Error(422, "", "Remote visit required two factors authentication.")
 	case models.IsErrReachLimitOfRepo(err):
-		ctx.Error(422, "", fmt.Sprintf("You have already reached your limit of %d repositories.", ctxUser.MaxCreationLimit()))
+		ctx.Error(422, "", fmt.Sprintf("You have already reached your limit of %d repositories.", ctx.User.MaxCreationLimit()))
 	case models.IsErrNameReserved(err):
 		ctx.Error(422, "", fmt.Sprintf("The username '%s' is reserved.", err.(models.ErrNameReserved).Name))
 	case models.IsErrNamePatternNotAllowed(err):