fix: rooms.membersOrderedByRole tests

Author: mdawoud27

apps/meteor/tests/end-to-end/api/rooms.ts

@@ -3589,11 +3589,13 @@ describe('[Rooms]', () => {
 				login(memberUser2.username, password),
 			]);
 
-			customRole = await createCustomRole({
-				name: `customRole.${Random.id()}`,
-				scope: 'Subscriptions',
-				description: 'Custom Role',
-			});
+			if (isEnterprise) {
+				customRole = await createCustomRole({
+					name: `customRole.${Random.id()}`,
+					scope: 'Subscriptions',
+					description: 'Custom Role',
+				});
+			}
 
 			// Create a public channel
 			const roomCreationResponse = await createRoom({
@@ -3765,7 +3767,7 @@ describe('[Rooms]', () => {
 		});
 
 		it('should not be affected by custom roles when sorting', async () => {
-			if (!isEnterprise) {
+			if (!isEnterprise || !customRole) {
 				return;
 			}
 			await Promise.all([
@@ -3859,11 +3861,13 @@ describe('[Rooms]', () => {
 
 				// Create a public team and a private team
 				[publicTeam, privateTeam] = await Promise.all([
-					createTeam(insideCredentials, `rooms.membersOrderedByRole.team.public.${Random.id()}`, TeamType.PUBLIC, [
+					createTeam(credentials, `rooms.membersOrderedByRole.team.public.${Random.id()}`, TeamType.PUBLIC, [
 						outsiderUser.username as string,
+						insideUser.username as string,
 					]),
-					createTeam(insideCredentials, `rooms.membersOrderedByRole.team.private.${Random.id()}`, TeamType.PRIVATE, [
+					createTeam(credentials, `rooms.membersOrderedByRole.team.private.${Random.id()}`, TeamType.PRIVATE, [
 						outsiderUser.username as string,
+						insideUser.username as string,
 					]),
 				]);
 
@@ -3878,44 +3882,42 @@ describe('[Rooms]', () => {
 					createRoom({
 						type: 'p',
 						name: `teamPublic.privateChannel.${Date.now()}`,
-						credentials: insideCredentials,
+						members: [insideUser.username as string],
 						extraData: {
 							teamId: publicTeam._id,
 						},
 					}),
 					createRoom({
 						type: 'c',
 						name: `teamPublic.publicChannel.${Date.now()}`,
-						credentials: insideCredentials,
 						extraData: {
 							teamId: publicTeam._id,
 						},
 					}),
 					createRoom({
 						type: 'p',
 						name: `teamPrivate.privateChannel.${Date.now()}`,
-						credentials: insideCredentials,
+						members: [insideUser.username as string],
 						extraData: {
 							teamId: privateTeam._id,
 						},
 					}),
 					createRoom({
 						type: 'c',
 						name: `teamPrivate.publicChannel.${Date.now()}`,
-						credentials: insideCredentials,
 						extraData: {
 							teamId: privateTeam._id,
 						},
 					}),
 					createRoom({
 						type: 'p',
 						name: `rooms.membersOrderedByRole.private.${Date.now()}`,
-						credentials: insideCredentials,
+						members: [insideUser.username as string],
 					}),
 					createRoom({
 						type: 'c',
 						name: `rooms.membersOrderedByRole.public.${Date.now()}`,
-						credentials: insideCredentials,
+						members: [insideUser.username as string],
 					}),
 				]);