test: Fix team and group mention test

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

tests/integration/features/bootstrap/FeatureContext.php

@@ -1963,6 +1963,13 @@ public function userSchedulesMessageToRoom(string $user, string $identifier, int
 			$row['threadId'] = self::$titleToThreadId[$row['threadId']];
 		}
 
+		if (str_contains($row['message'], '@"TEAM_ID(')) {
+			$result = preg_match('/TEAM_ID\(([^)]+)\)/', $row['message'], $matches);
+			if ($result) {
+				$row['message'] = str_replace($matches[0], 'team/' . self::getTeamIdForLabel($this->currentServer, $matches[1]), $row['message']);
+			}
+		}
+
 		$this->setCurrentUser($user);
 		$this->sendRequest(
 			'POST',
@@ -2054,6 +2061,13 @@ public function userSeesTheFollowingScheduledMessagesInRoom(string $user, string
 
 		$expected = $formData->getColumnsHash();
 		foreach ($expected as &$row) {
+			if (str_contains($row['message'], '@"TEAM_ID(')) {
+				$result = preg_match('/TEAM_ID\(([^)]+)\)/', $row['message'], $matches);
+				if ($result) {
+					$row['message'] = str_replace($matches[0], 'team/' . self::getTeamIdForLabel($this->currentServer, $matches[1]), $row['message']);
+				}
+			}
+
 			$row['id'] = self::$textToMessageId[$row['message']];
 			if ($row['sendAt'] !== '0') {
 				$row['sendAt'] = self::$messageIdToTimestamp[$row['id']];
@@ -2869,6 +2883,10 @@ protected function compareDataResponse(?TableNode $formData = null): void {
 			if ($result) {
 				$expected[$i]['messageParameters'] = str_replace($matches[0], '"' . self::$questionToPollId[$matches[1]] . '"', $expected[$i]['messageParameters']);
 			}
+			$result = preg_match('/TEAM_ID\(([^)]+)\)/', $expected[$i]['messageParameters'], $matches);
+			if ($result) {
+				$expected[$i]['messageParameters'] = str_replace($matches[0], self::getTeamIdForLabel($this->currentServer, $matches[1]), $expected[$i]['messageParameters']);
+			}
 			if (isset($messages[$i]['messageParameters']['object']['icon-url'])) {
 				$result = preg_match('/"\{VALIDATE_ICON_URL_PATTERN\}"/', $expected[$i]['messageParameters'], $matches);
 				if ($result) {

tests/integration/features/chat-4/scheduled-messages.feature

@@ -529,23 +529,20 @@ Feature: chat-4/scheduling
 
   Scenario: Schedule a message mentioning a group
     Given group "group" exists
-    Given team "team" exists
-    Given user "participant3" exists
-    Given user "participant4" exists
-    And user "participant3" is member of group "group"
-    And user "participant4" is member of team "team"
+    And set display name of group "group" to "group-displayname"
+    Given User "participant1" creates team "team"
     And user "participant1" adds group "group" to room "room" with 200 (v4)
     And user "participant1" adds team "team" to room "room" with 200 (v4)
     When user "participant1" schedules a message to room "room" with 201
-      | message | Message 1 @group |
-      | sendAt  | {NOW}            |
+      | message | Message 1 @"group/group" |
+      | sendAt  | {NOW}                    |
     And user "participant1" schedules a message to room "room" with 201
-      | message | Message 2 @team |
-      | sendAt  | {NOW}            |
+      | message | Message 2 @"TEAM_ID(team)" |
+      | sendAt  | {NOW}                      |
     Then user "participant1" sees the following scheduled messages in room "room" with 200
-      | id               | actorType | actorId      | threadId | parent | message          | messageType | sendAt | silent |
-      | Message 1 @group | users     | participant1 | 0        | null   | Message 1 @group | comment     | {NOW}  | false  |
-      | Message 2 @team  | users     | participant1 | 0        | null   | Message 2 @team  | comment     | {NOW}  | false  |
+      | id                       | actorType | actorId      | threadId | parent | message                  | messageType | sendAt | silent |
+      | Message 1 @"group/group" | users     | participant1 | 0        | null   | Message 1 @"group/group" | comment     | {NOW}  | false  |
+      | Message 2 @"TEAM_ID(team)" | users     | participant1 | 0        | null   | Message 2 @"TEAM_ID(team)" | comment     | {NOW}  | false  |
     And user "participant1" is participant of the following rooms (v4)
       | id   | type | hasScheduledMessages |
       | room | 2    | 2                    |
@@ -556,7 +553,7 @@ Feature: chat-4/scheduling
       | id   | type | hasScheduledMessages |
       | room | 2    | 0                    |
     Then user "participant2" sees the following messages in room "room" with 200
-      | room | actorType | actorId      | actorDisplayName         | messageType | message                   | messageParameters                                                                               |
-      | room | users     | participant1 | participant1-displayname | comment     | Message 2 {mention-team}  | {"mention-team":{"type":"team","id":"team","name":"team-displayname","mention-id":"team"}}      |
-      | room | users     | participant1 | participant1-displayname | comment     | Message 1 {mention-group} | {"mention-group":{"type":"group","id":"group","name":"group-displayname","mention-id":"group"}} |
-      | room | users     | participant2 | participant2-displayname | comment     | Message                   | []                                                                                              |
+      | room | actorType | actorId      | actorDisplayName         | messageType | message                   | messageParameters                                                                                             |
+      | room | users     | participant1 | participant1-displayname | comment     | Message 2 {mention-team1}  | {"mention-team1":{"type":"circle","id":"TEAM_ID(team)","name":"team","link":"","mention-id":"team\/TEAM_ID(team)"}}      |
+      | room | users     | participant1 | participant1-displayname | comment     | Message 1 {mention-group1} | {"mention-group1":{"type":"user-group","id":"group","name":"group-displayname","mention-id":"group\/group"}} |
+      | room | users     | participant2 | participant2-displayname | comment     | Message                   | []                                                                                                            |