fix merge

Author: davidsvantesson

integrations/api_repo_test.go

@@ -347,8 +347,8 @@ func TestAPIOrgRepoCreate(t *testing.T) {
 		{ctxUserID: 1, orgName: "user3", repoName: "repo-admin", expectedStatus: http.StatusCreated},
 		{ctxUserID: 2, orgName: "user3", repoName: "repo-own", expectedStatus: http.StatusCreated},
 		{ctxUserID: 2, orgName: "user6", repoName: "repo-bad-org", expectedStatus: http.StatusForbidden},
-		{ctxUserID: 27, orgName: "user3", repoName: "repo-creator", expectedStatus: http.StatusCreated},
-		{ctxUserID: 27, orgName: "user6", repoName: "repo-not-creator", expectedStatus: http.StatusForbidden},
+		{ctxUserID: 28, orgName: "user3", repoName: "repo-creator", expectedStatus: http.StatusCreated},
+		{ctxUserID: 28, orgName: "user6", repoName: "repo-not-creator", expectedStatus: http.StatusForbidden},
 	}
 
 	prepareTestEnv(t)

models/fixtures/user.yml

@@ -50,8 +50,8 @@
   avatar: avatar3
   avatar_email: [email protected]
   num_repos: 3
-  num_members: 2
-  num_teams: 3
+  num_members: 3
+  num_teams: 4
 
 -
   id: 4
@@ -102,8 +102,8 @@
   avatar: avatar6
   avatar_email: [email protected]
   num_repos: 0
-  num_members: 1
-  num_teams: 1
+  num_members: 2
+  num_teams: 2
 
 -
   id: 7

models/migrations/v108..go renamed to models/migrations/v108.go

@@ -101,7 +101,7 @@ func TestUser_GetMembers(t *testing.T) {
 	assert.NoError(t, org.GetMembers())
 	if assert.Len(t, org.Members, 3) {
 		assert.Equal(t, int64(2), org.Members[0].ID)
-		assert.Equal(t, int64(27), org.Members[1].ID)
+		assert.Equal(t, int64(28), org.Members[1].ID)
 		assert.Equal(t, int64(4), org.Members[2].ID)
 	}
 }

models/org_test.go

@@ -153,13 +153,13 @@ func TestSearchUsers(t *testing.T) {
 	}
 
 	testUserSuccess(&SearchUserOptions{OrderBy: "id ASC", Page: 1},
-		[]int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27})
+		[]int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28})
 
 	testUserSuccess(&SearchUserOptions{Page: 1, IsActive: util.OptionalBoolFalse},
 		[]int64{9})
 
 	testUserSuccess(&SearchUserOptions{OrderBy: "id ASC", Page: 1, IsActive: util.OptionalBoolTrue},
-		[]int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27})
+		[]int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 28})
 
 	testUserSuccess(&SearchUserOptions{Keyword: "user1", OrderBy: "id ASC", Page: 1, IsActive: util.OptionalBoolTrue},
 		[]int64{1, 10, 11, 12, 13, 14, 15, 16, 18})

models/user_test.go

@@ -17,8 +17,8 @@ func TestUserListIsPublicMember(t *testing.T) {
 		orgid    int64
 		expected map[int64]bool
 	}{
-		{3, map[int64]bool{2: true, 4: false, 27: true}},
-		{6, map[int64]bool{5: true, 27: true}},
+		{3, map[int64]bool{2: true, 4: false, 28: true}},
+		{6, map[int64]bool{5: true, 28: true}},
 		{7, map[int64]bool{5: false}},
 		{25, map[int64]bool{24: true}},
 		{22, map[int64]bool{}},
@@ -43,8 +43,8 @@ func TestUserListIsUserOrgOwner(t *testing.T) {
 		orgid    int64
 		expected map[int64]bool
 	}{
-		{3, map[int64]bool{2: true, 4: false, 27: false}},
-		{6, map[int64]bool{5: true, 27: false}},
+		{3, map[int64]bool{2: true, 4: false, 28: false}},
+		{6, map[int64]bool{5: true, 28: false}},
 		{7, map[int64]bool{5: true}},
 		{25, map[int64]bool{24: false}}, // ErrTeamNotExist
 		{22, map[int64]bool{}},          // No member
@@ -69,8 +69,8 @@ func TestUserListIsTwoFaEnrolled(t *testing.T) {
 		orgid    int64
 		expected map[int64]bool
 	}{
-		{3, map[int64]bool{2: false, 4: false, 27: false}},
-		{6, map[int64]bool{5: false, 27: false}},
+		{3, map[int64]bool{2: false, 4: false, 28: false}},
+		{6, map[int64]bool{5: false, 28: false}},
 		{7, map[int64]bool{5: false}},
 		{25, map[int64]bool{24: true}},
 		{22, map[int64]bool{}},