fixup! fixup! feat(call): Direct endpoint to check if call notificati…

…on should be dismissed
nextcloud · Dec 4, 2024 · ab8f65c · ab8f65c
1 parent de23b4b
commit ab8f65c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
@@ -2128,6 +2128,21 @@ public function userJoinsCall(string $user, string $identifier, int $statusCode,
 		}
 	}
 
+	/**
+	 * @Then /^user "([^"]*)" checks call notification for "([^"]*)" with (\d+) \((v4)\)$/
+	 *
+	 * @param string $user
+	 * @param string $identifier
+	 * @param int $statusCode
+	 * @param string $apiVersion
+	 * @param TableNode|null $formData
+	 */
+	public function userChecksCallNotification(string $user, string $identifier, int $statusCode, string $apiVersion, ?TableNode $formData = null): void {
+		$this->setCurrentUser($user);
+		$this->sendRequest('GET', '/apps/spreed/api/' . $apiVersion . '/call/' . self::$identifierToToken[$identifier] . '/notification');
+		$this->assertStatusCode($this->response, $statusCode);
+	}
+
 	/**
 	 * @Then /^user "([^"]*)" updates call flags in room "([^"]*)" to "([^"]*)" with (\d+) \((v4)\)$/
 	 *

diff --git a/tests/integration/features/callapi/notifications.feature b/tests/integration/features/callapi/notifications.feature
@@ -11,11 +11,14 @@ Feature: callapi/notifications
     And user "participant1" adds user "participant2" to room "room" with 200 (v4)
     Given user "participant1" joins room "room" with 200 (v4)
     Given user "participant2" joins room "room" with 200 (v4)
+    Then user "participant2" checks call notification for "room" with 201 (v4)
     Given user "participant1" joins call "room" with 200 (v4)
+    Then user "participant2" checks call notification for "room" with 200 (v4)
     Then user "participant2" has the following notifications
       | app    | object_type | object_id | subject                          |
       | spreed | call        | room      | A group call has started in room |
     Given user "participant2" joins call "room" with 200 (v4)
+    Then user "participant2" checks call notification for "room" with 201 (v4)
     Then user "participant2" has the following notifications
       | app | object_type | object_id | subject |
 
@@ -26,7 +29,9 @@ Feature: callapi/notifications
     And user "participant1" adds user "participant2" to room "room" with 200 (v4)
     Given user "participant1" joins room "room" with 200 (v4)
     Given user "participant2" joins room "room" with 200 (v4)
+    Then user "participant2" checks call notification for "room" with 201 (v4)
     Given user "participant1" joins call "room" with 200 (v4)
+    Then user "participant2" checks call notification for "room" with 200 (v4)
     Then user "participant2" sees the following system messages in room "room" with 200
       | room | actorType     | actorId      | systemMessage        | message                          | silent | messageParameters |
       | room | users         | participant1 | call_started         | {actor} started a call           | !ISSET | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} |
@@ -36,6 +41,7 @@ Feature: callapi/notifications
       | app    | object_type | object_id | subject                          |
       | spreed | call        | room      | A group call has started in room |
     Given user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant2" checks call notification for "room" with 201 (v4)
     Then user "participant2" has the following notifications
       | app    | object_type | object_id | subject                         |
       | spreed | call        | room      | You missed a group call in room |
@@ -76,7 +82,7 @@ Feature: callapi/notifications
     Then user "participant2" has the following notifications
       | app    | object_type | object_id | subject                          |
       | spreed | call        | room      | A group call has started in room |
-  
+
   Scenario: Calling an attendee that is in DND throws an error 'status' message with 400
     When user "participant1" creates room "room" (v4)
       | roomType | 2 |

diff --git a/tests/integration/features/federation/call.feature b/tests/integration/features/federation/call.feature
@@ -24,9 +24,13 @@ Feature: federation/call
       | LOCAL::room | room | 2    | LOCAL        | room        |
     And using server "LOCAL"
     And user "participant1" joins room "room" with 200 (v4)
+    And using server "REMOTE"
+    Then user "participant2" checks call notification for "LOCAL::room" with 201 (v4)
+    And using server "LOCAL"
     And user "participant1" joins call "room" with 200 (v4)
       | flags | 3 |
     And using server "REMOTE"
+    Then user "participant2" checks call notification for "LOCAL::room" with 200 (v4)
     And user "participant2" joins room "LOCAL::room" with 200 (v4)
     And user "participant2" is participant of room "LOCAL::room" (v4)
       | callFlag |
@@ -35,8 +39,10 @@ Feature: federation/call
       | actorType       | actorId                   | inCall |
       | federated_users | participant1@{$LOCAL_URL} | 3      |
       | users           | participant2              | 0      |
+    Then user "participant2" checks call notification for "LOCAL::room" with 200 (v4)
     When user "participant2" joins call "LOCAL::room" with 200 (v4)
       | flags | 7 |
+    Then user "participant2" checks call notification for "LOCAL::room" with 404 (v4)
     Then using server "LOCAL"
     And user "participant1" is participant of room "room" (v4)
       | callFlag |
@@ -254,11 +260,16 @@ Feature: federation/call
       | id          | name | type | remoteServer | remoteToken |
       | LOCAL::room | room | 2    | LOCAL        | room        |
     And user "participant2" joins room "LOCAL::room" with 200 (v4)
+    Then user "participant2" checks call notification for "LOCAL::room" with 201 (v4)
     And using server "LOCAL"
     And user "participant1" joins room "room" with 200 (v4)
     And user "participant1" joins call "room" with 200 (v4)
+    And using server "REMOTE"
+    Then user "participant2" checks call notification for "LOCAL::room" with 200 (v4)
+    And using server "LOCAL"
     When user "participant1" leaves call "room" with 200 (v4)
     Then using server "REMOTE"
+    Then user "participant2" checks call notification for "LOCAL::room" with 201 (v4)
     And user "participant2" has the following notifications
       | app    | object_type | object_id   | subject                         |
       | spreed | call        | LOCAL::room | You missed a group call in room |