test: add flaky step for resource expiration

Author: anon-pradip

tests/acceptance/bootstrap/SpacesContext.php

@@ -2695,32 +2695,8 @@ public function userExpiresTheLastShareOfResourceInsideOfTheSpace(
 		string $resource,
 		string $spaceName
 	): void {
-		$dateTime = new DateTime('yesterday');
-		$rows['expireDate'] = $dateTime->format('Y-m-d\\TH:i:sP');
-		if ($this->featureContext->isUsingSharingNG()) {
-			$space = $this->getSpaceByName($user, $spaceName);
-			$itemId = $this->getResourceId($user, $spaceName, $resource);
-			$body['expirationDateTime'] = $rows['expireDate'];
-			$permissionID = $this->featureContext->shareNgGetLastCreatedUserGroupShareID();
-			$response = GraphHelper::updateShare(
-				$this->featureContext->getBaseUrl(),
-				$this->featureContext->getStepLineRef(),
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$space["id"],
-				$itemId,
-				\json_encode($body),
-				$permissionID
-			);
-
-			if ($response->getStatusCode() === 200) {
-				$this->featureContext->shareNgAddToCreatedUserGroupShares($response);
-			}
-			$this->featureContext->setResponse($response);
-		} else {
-			$rows['permissions'] = (string)$this->featureContext->getLastCreatedUserGroupShare()->permissions;
-			$this->featureContext->setResponse($this->updateSharedResource($user, $rows));
-		}
+		$response = $this->expireResourceShare($user, $resource, $spaceName);
+		$this->featureContext->setResponse($response);
 	}
 
 	/**
@@ -4829,4 +4805,59 @@ public function userHasExpiredTheMembershipOfUserFromSpace(
 		$rows['shareWith'] = $memberUser;
 		$this->featureContext->setResponse($this->shareSpace($user, $spaceName, $rows));
 	}
+
+	/**
+	 * @param string $user
+	 * @param string $resource
+	 * @param string $spaceName
+	 *
+	 * @return ResponseInterface
+	 * @throws GuzzleException|JsonException
+	 */
+	public function expireResourceShare(string $user, string $resource, string $spaceName): ResponseInterface {
+		$rows['expireDate'] = $this->featureContext->formatExpiryDateTime('Y-m-d\\TH:i:sP');
+		if ($this->featureContext->isUsingSharingNG()) {
+			$space = $this->getSpaceByName($user, $spaceName);
+			$itemId = $this->getResourceId($user, $spaceName, $resource);
+			$body['expirationDateTime'] = $rows['expireDate'];
+			$permissionID = $this->featureContext->shareNgGetLastCreatedUserGroupShareID();
+			$response = GraphHelper::updateShare(
+				$this->featureContext->getBaseUrl(),
+				$this->featureContext->getStepLineRef(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$space["id"],
+				$itemId,
+				\json_encode($body),
+				$permissionID
+			);
+
+			if ($response->getStatusCode() === 200) {
+				$this->featureContext->shareNgAddToCreatedUserGroupShares($response);
+			}
+			return $response;
+		} else {
+			$rows['permissions'] = (string)$this->featureContext->getLastCreatedUserGroupShare()->permissions;
+			return $this->updateSharedResource($user, $rows);
+		}
+	}
+
+	/**
+	 * @Given user :user has expired the last share of resource :resource inside of the space :spaceName
+	 *
+	 * @param string $user
+	 * @param string $resource
+	 * @param string $spaceName
+	 *
+	 * @return void
+	 * @throws GuzzleException|JsonException
+	 */
+	public function userHasExpiredTheLastShareOfResourceInsideOfTheSpace(
+		string $user,
+		string $resource,
+		string $spaceName
+	): void {
+		$response = $this->expireResourceShare($user, $resource, $spaceName);
+		$this->featureContext->theHTTPStatusCodeShouldBe(200, "", $response);
+	}
 }

tests/acceptance/features/cliCommands/emailNotification.feature

@@ -26,6 +26,14 @@ Feature: get grouped email notification
       | shareType       | user      |
       | permissionsRole | Viewer    |
     And user "Alice" has removed the access of user "Brian" from resource "lorem.txt" of space "Personal"
+    And user "Alice" has sent the following resource share invitation:
+      | resource           | lorem.txt                |
+      | space              | Personal                 |
+      | sharee             | Brian                    |
+      | shareType          | user                     |
+      | permissionsRole    | Viewer                   |
+      | expirationDateTime | 2042-01-01T23:59:59.000Z |
+    And user "Alice" has expired the last share of resource "lorem.txt" inside of the space "Personal"
     And user "Alice" has sent the following space share invitation:
       | space           | New-Space    |
       | sharee          | Brian        |
@@ -54,6 +62,11 @@ Feature: get grouped email notification
       Even though this share has been revoked you still might have access through other shares and/or space memberships.
 
 
+      Your membership of space Alice Hansen has expired at %expiry_date_in_mail%
+
+      Even though this membership has expired you still might have access through other shares and/or space memberships
+
+
       Alice Hansen has invited you to join "New-Space".
 
 
@@ -80,6 +93,14 @@ Feature: get grouped email notification
       | shareType       | user      |
       | permissionsRole | Viewer    |
     And user "Alice" has removed the access of user "Brian" from resource "lorem.txt" of space "Personal"
+    And user "Alice" has sent the following resource share invitation:
+      | resource           | lorem.txt                |
+      | space              | Personal                 |
+      | sharee             | Brian                    |
+      | shareType          | user                     |
+      | permissionsRole    | Viewer                   |
+      | expirationDateTime | 2042-01-01T23:59:59.000Z |
+    And user "Alice" has expired the last share of resource "lorem.txt" inside of the space "Personal"
     And user "Alice" has sent the following space share invitation:
       | space           | New-Space    |
       | sharee          | Brian        |
@@ -108,6 +129,11 @@ Feature: get grouped email notification
       Even though this share has been revoked you still might have access through other shares and/or space memberships.
 
 
+      Your membership of space Alice Hansen has expired at %expiry_date_in_mail%
+
+      Even though this membership has expired you still might have access through other shares and/or space memberships
+
+
       Alice Hansen has invited you to join "New-Space".