fix mail cleanup

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

tests/acceptance/features/apiNotification/emailNotification.feature

@@ -1,4 +1,3 @@
-@email
 Feature: Email notification
   As a user
   I want to get email notification of events related to me

tests/acceptance/features/apiNotification/shareExpireNotification.feature

@@ -1,4 +1,3 @@
-@email
 Feature: Share Expiry Notification
   As a user
   I want to be notified when share expires

tests/acceptance/features/apiOcm/createInvitation.feature

@@ -76,7 +76,7 @@ Feature: create invitation
       | @domain.com                       | 400  |
       | user@domain..com                  | 400  |
 
-  @email @issue-10059
+  @issue-10059
   Scenario: federated user gets an email notification if their email was specified when creating the federation share invitation
     Given using server "REMOTE"
     And user "David" has been created with default attributes

tests/acceptance/features/apiSettings/notificationSetting.feature

@@ -1,4 +1,3 @@
-@email
 Feature: Notification Settings
   As a user
   I want to manage my notification settings