fix mail cleanup

Author: amrita-shrestha

tests/acceptance/bootstrap/NotificationContext.php

@@ -48,9 +48,10 @@ public function getLastNotificationId(): array {
 	}
 
 	/**
-	 * @AfterScenario
+	 * delete de-provisioning notification
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function deleteDeprovisioningNotification(): void {
 		$payload["ids"] = ["deprovision"];
@@ -66,6 +67,41 @@ public function deleteDeprovisioningNotification(): void {
 		);
 	}
 
+	/**
+	 * Delete all the inbucket emails
+	 *
+	 * @return void
+	 * @throws GuzzleException
+	 */
+	public function clearInbucketMessages(): void {
+		try {
+			$usersList = $this->featureContext->getAllCreatedUsers();
+			foreach ($usersList as $emailRecipient) {
+				EmailHelper::deleteAllEmailsForAMailbox(
+					EmailHelper::getLocalEmailUrl(),
+					$this->featureContext->getStepLineRef(),
+					$emailRecipient['email']
+				);
+			}
+		} catch (Exception $e) {
+			echo __METHOD__ .
+				" could not delete inbucket messages, is inbucket set up?\n" .
+				$e->getMessage();
+		}
+	}
+
+	/**
+	 * @AfterScenario
+	 *
+	 * @return void
+	 * @throws GuzzleException
+	 * @throws JsonException
+	 */
+	public function deleteAllNotifications(): void {
+		$this->deleteDeprovisioningNotification();
+		$this->clearInbucketMessages();
+	}
+
 	/**
 	 * @var string
 	 */
@@ -151,7 +187,7 @@ public function userListAllNotifications(string $user): void {
 	 * @throws GuzzleException
 	 * @throws JsonException
 	 */
-	public function deleteAllNotifications(string $user): ResponseInterface {
+	public function deleteAllInAppNotifications(string $user): ResponseInterface {
 		$response = $this->listAllNotifications($user);
 		if (isset($this->featureContext->getJsonDecodedResponseBodyContent($response)->ocs->data)) {
 			$responseBody = $this->featureContext->getJsonDecodedResponseBodyContent($response)->ocs->data;
@@ -173,7 +209,7 @@ public function deleteAllNotifications(string $user): ResponseInterface {
 	 * @throws JsonException
 	 */
 	public function userDeletesAllNotifications(string $user): void {
-		$response = $this->deleteAllNotifications($user);
+		$response = $this->deleteAllInAppNotifications($user);
 		$this->featureContext->setResponse($response);
 	}
 
@@ -187,7 +223,7 @@ public function userDeletesAllNotifications(string $user): void {
 	 * @throws JsonException
 	 */
 	public function userHasDeletedAllNotifications(string $user): void {
-		$response = $this->deleteAllNotifications($user);
+		$response = $this->deleteAllInAppNotifications($user);
 		$this->featureContext->theHTTPStatusCodeShouldBe(200, "", $response);
 	}
 
@@ -661,30 +697,6 @@ public function assertEmailContains(
 		);
 	}
 
-	/**
-	 * Delete all the inbucket emails
-	 *
-	 * @AfterScenario @email
-	 *
-	 * @return void
-	 */
-	public function clearInbucketMessages(): void {
-		try {
-			$usersList = $this->featureContext->getAllCreatedUsers();
-			foreach ($usersList as $emailRecipient) {
-				EmailHelper::deleteAllEmailsForAMailbox(
-					EmailHelper::getLocalEmailUrl(),
-					$this->featureContext->getStepLineRef(),
-					$emailRecipient['email']
-				);
-			}
-		} catch (Exception $e) {
-			echo __METHOD__ .
-				" could not delete inbucket messages, is inbucket set up?\n" .
-				$e->getMessage();
-		}
-	}
-
 	/**
 	 *
 	 * @param string|null $user