From 3e88b2cc25da904d9763e8d7c826e900d470ab6e Mon Sep 17 00:00:00 2001
From: nirajacharya2 <122071597+nirajacharya2@users.noreply.github.com>
Date: Mon, 6 May 2024 15:22:20 +0545
Subject: [PATCH] removing usage of a stepdefination inside another
 stepdefination in NotificationContext.php (#9022)

---
 .../bootstrap/NotificationContext.php         | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/acceptance/features/bootstrap/NotificationContext.php b/tests/acceptance/features/bootstrap/NotificationContext.php
index 8e2449e66b..b25c3b7640 100644
--- a/tests/acceptance/features/bootstrap/NotificationContext.php
+++ b/tests/acceptance/features/bootstrap/NotificationContext.php
@@ -51,7 +51,17 @@ class NotificationContext implements Context {
 	 * @return void
 	 */
 	public function deleteDeprovisioningNotification(): void {
-		$this->userDeletesDeprovisioningNotification();
+		$payload["ids"] = ["deprovision"];
+
+		OcsApiHelper::sendRequest(
+			$this->featureContext->getBaseUrl(),
+			$this->featureContext->getAdminUsername(),
+			$this->featureContext->getAdminPassword(),
+			'DELETE',
+			$this->globalNotificationEndpointPath,
+			$this->featureContext->getStepLineRef(),
+			json_encode($payload)
+		);
 	}
 
 	/**
@@ -242,8 +252,9 @@ class NotificationContext implements Context {
 	 * @throws Exception
 	 */
 	public function userShouldNotHaveAnyNotification($user): void {
-		$this->userListAllNotifications($user);
-		$this->theNotificationsShouldBeEmpty();
+		$response = $this->listAllNotifications($user);
+		$notifications = $this->featureContext->getJsonDecodedResponseBodyContent($response)->ocs->data;
+		Assert::assertNull($notifications, "response should not contain any notification");
 	}
 
 	/**
@@ -414,8 +425,8 @@ class NotificationContext implements Context {
 				$actualMessage,
 				__METHOD__ . "expected message to be '$expectedMessage' but found'$actualMessage'"
 			);
-			$this->userDeletesNotificationOfResourceAndSubject($user, $resource, $subject);
-			$this->featureContext->theHTTPStatusCodeShouldBe(200);
+			$response = $this->userDeletesNotification($user);
+			$this->featureContext->theHTTPStatusCodeShouldBe(200, '', $response);
 		} elseif (\count($notification) === 0) {
 			throw new \Exception("Response doesn't contain any notification with resource '$resource' and subject '$subject'.\n" . print_r($notification, true));
 		} else {