fix tests

sreya · sreya · commit 1b3ec51cea39 · 2023-08-16T01:55:30.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -1413,10 +1413,7 @@ func (q *FakeQuerier) GetGroupsByOrganizationID(_ context.Context, organizationI
 
 	var groups []database.Group
 	for _, group := range q.groups {
-		// Omit the allUsers group.
-		if group.OrganizationID == organizationID && group.ID != organizationID {
-			groups = append(groups, group)
-		}
+		groups = append(groups, group)
 	}
 
 	return groups, nil
diff --git a/coderd/database/queries/groupmembers.sql b/coderd/database/queries/groupmembers.sql
@@ -3,13 +3,13 @@ SELECT
 	users.*
 FROM
 	users
-LEFT JOIN
+RIGHT JOIN
 	group_members
 ON
 	CASE WHEN @id:: uuid != @organization_id :: uuid THEN
 	group_members.user_id = users.id
 	END
-LEFT JOIN
+RIGHT JOIN
 	organization_members
 ON
     CASE WHEN @id :: uuid = @organization_id :: uuid THEN
diff --git a/enterprise/coderd/groups_test.go b/enterprise/coderd/groups_test.go
@@ -420,7 +420,6 @@ func TestPatchGroup(t *testing.T) {
 		cerr, ok := codersdk.AsError(err)
 		require.True(t, ok)
 		require.Equal(t, http.StatusBadRequest, cerr.StatusCode())
-
 	})
 
 	t.Run("EveryoneGroup", func(t *testing.T) {
@@ -747,7 +746,8 @@ func TestGroups(t *testing.T) {
 
 		groups, err := client.GroupsByOrganization(ctx, user.OrganizationID)
 		require.NoError(t, err)
-		require.Len(t, groups, 2)
+		// 'Everyone' group + 2 custom groups.
+		require.Len(t, groups, 3)
 		require.Contains(t, groups, group1)
 		require.Contains(t, groups, group2)
 	})
diff --git a/enterprise/coderd/userauth_test.go b/enterprise/coderd/userauth_test.go
@@ -525,7 +525,7 @@ func TestGroupSync(t *testing.T) {
 			require.NoError(t, err)
 
 			for _, group := range orgGroups {
-				if slice.Contains(tc.initialOrgGroups, group.Name) {
+				if slice.Contains(tc.initialOrgGroups, group.Name) || group.OrganizationID == group.ID {
 					require.Equal(t, group.Source, codersdk.GroupSourceUser)
 				} else {
 					require.Equal(t, group.Source, codersdk.GroupSourceOIDC)
@@ -543,6 +543,7 @@ func TestGroupSync(t *testing.T) {
 				}
 				delete(orgGroupsMap, expected)
 			}
+			delete(orgGroupsMap, database.AllUsersGroup)
 			require.Empty(t, orgGroupsMap, "unexpected groups found")
 
 			expectedUserGroups := make(map[string]struct{})
@@ -554,7 +555,9 @@ func TestGroupSync(t *testing.T) {
 				userInGroup := slice.ContainsCompare(group.Members, codersdk.User{Email: user.Email}, func(a, b codersdk.User) bool {
 					return a.Email == b.Email
 				})
-				if _, ok := expectedUserGroups[group.Name]; ok {
+				if group.ID == group.OrganizationID {
+					require.True(t, userInGroup, "user cannot be removed from 'Everyone' group")
+				} else if _, ok := expectedUserGroups[group.Name]; ok {
 					require.Truef(t, userInGroup, "user should be in group %s", group.Name)
 				} else {
 					require.Falsef(t, userInGroup, "user should not be in group %s", group.Name)
