Fix tests

Author: lunny

integrations/api_team_test.go

@@ -111,7 +111,6 @@ func TestAPITeam(t *testing.T) {
 	checkTeamResponse(t, &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories,
 		teamRead.Authorize.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
 
-	panic("")
 	// Delete team.
 	req = NewRequestf(t, "DELETE", "/api/v1/teams/%d?token="+token, teamID)
 	session.MakeRequest(t, req, http.StatusNoContent)

models/org_team.go

@@ -446,15 +446,15 @@ func (t *Team) UnitEnabled(tp unit.Type) bool {
 }
 
 func (t *Team) unitEnabled(e db.Engine, tp unit.Type) bool {
-	return t.unitAccessMode(e, tp) > AccessModeNone
+	return t.unitAccessMode(e, tp) > perm.AccessModeNone
 }
 
 // UnitAccessMode returns if the team has the given unit type enabled
-func (t *Team) UnitAccessMode(tp unit.Type) AccessMode {
+func (t *Team) UnitAccessMode(tp unit.Type) perm.AccessMode {
 	return t.unitAccessMode(db.GetEngine(db.DefaultContext), tp)
 }
 
-func (t *Team) unitAccessMode(e db.Engine, tp unit.Type) AccessMode {
+func (t *Team) unitAccessMode(e db.Engine, tp unit.Type) perm.AccessMode {
 	if err := t.getUnits(e); err != nil {
 		log.Warn("Error loading team (ID: %d) units: %s", t.ID, err.Error())
 	}
@@ -464,7 +464,7 @@ func (t *Team) unitAccessMode(e db.Engine, tp unit.Type) AccessMode {
 			return unit.Authorize
 		}
 	}
-	return AccessModeNone
+	return perm.AccessModeNone
 }
 
 // IsUsableTeamName tests if a name could be as team name
@@ -1037,7 +1037,7 @@ type TeamUnit struct {
 	OrgID     int64     `xorm:"INDEX"`
 	TeamID    int64     `xorm:"UNIQUE(s)"`
 	Type      unit.Type `xorm:"UNIQUE(s)"`
-	Authorize AccessMode
+	Authorize perm.AccessMode
 }
 
 // Unit returns Unit

models/repo_permission.go

@@ -246,7 +246,7 @@ func getUserRepoPermission(e db.Engine, repo *Repository, user *user_model.User)
 		var found bool
 		for _, team := range teams {
 			teamMode := team.unitAccessMode(e, u.Type)
-			if teamMode > AccessModeNone {
+			if teamMode > perm_model.AccessModeNone {
 				m := perm.UnitsMode[u.Type]
 				if m < teamMode {
 					perm.UnitsMode[u.Type] = teamMode

routers/api/v1/org/team.go

@@ -162,21 +162,21 @@ func attachTeamUnits(team *models.Team, units []string) {
 	}
 }
 
-func convertUnitsMap(unitsMap map[string]string) map[unit_model.Type]models.AccessMode {
-	var res = make(map[unit_model.Type]models.AccessMode, len(unitsMap))
-	for unitKey, perm := range unitsMap {
-		res[unit_model.TypeFromKey(unitKey)] = models.ParseAccessMode(perm)
+func convertUnitsMap(unitsMap map[string]string) map[unit_model.Type]perm.AccessMode {
+	var res = make(map[unit_model.Type]perm.AccessMode, len(unitsMap))
+	for unitKey, p := range unitsMap {
+		res[unit_model.TypeFromKey(unitKey)] = perm.ParseAccessMode(p)
 	}
 	return res
 }
 
 func attachTeamUnitsMap(team *models.Team, unitsMap map[string]string) {
 	team.Units = make([]*models.TeamUnit, 0, len(unitsMap))
-	for unitKey, perm := range unitsMap {
+	for unitKey, p := range unitsMap {
 		team.Units = append(team.Units, &models.TeamUnit{
 			OrgID:     team.OrgID,
 			Type:      unit_model.TypeFromKey(unitKey),
-			Authorize: perm.ParseAccessMode(perm),
+			Authorize: perm.ParseAccessMode(p),
 		})
 	}
 }