test: update step for resource expiration

Author: Ashim-Stha

tests/acceptance/bootstrap/SharingNgContext.php

@@ -183,6 +183,23 @@ public function getPermissionsList(
 		);
 	}
 
+	/**
+	 * @Given /^user "([^"]*)" has triggered the share expiration notification for (?:folder|file) "([^"]*)"$/
+	 *
+	 * @param string $user
+	 * @param string $resource
+	 *
+	 * @return void
+	 * @throws GuzzleException
+	 */
+	public function userHasTriggeredTheShareExpirationNotificationForResource(
+		string $user,
+		string $resource,
+	): void {
+		$response = $this->getPermissionsList($user, "Personal", $resource);
+		$this->featureContext->theHTTPStatusCodeShouldBe(200, "", $response);
+	}
+
 	/**
 	 * @When /^user "([^"]*)" gets permissions list for (?:folder|file) "([^"]*)" of the space "([^"]*)" using the Graph API$/
 	 *

tests/acceptance/bootstrap/SpacesContext.php

@@ -2724,6 +2724,19 @@ public function userExpiresTheLastShareOfResourceInsideOfTheSpace(
 		string $resource,
 		string $spaceName,
 	): void {
+		$response = $this->expireResourceShare($user, $resource, $spaceName);
+		$this->featureContext->setResponse($response);
+	}
+
+	/**
+	 * @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);
@@ -2743,11 +2756,29 @@ public function userExpiresTheLastShareOfResourceInsideOfTheSpace(
 			if ($response->getStatusCode() === 200) {
 				$this->featureContext->shareNgAddToCreatedUserGroupShares($response, $resource, $spaceName);
 			}
-			$this->featureContext->setResponse($response);
-		} else {
-			$rows['permissions'] = (string)$this->featureContext->getLastCreatedUserGroupShare()->permissions;
-			$this->featureContext->setResponse($this->updateSharedResource($user, $rows));
+			return $response;
 		}
+		$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

@@ -16,7 +16,7 @@ Feature: get grouped email notification
     And user "Alice" has created a space "New-Space" with the default quota using the Graph API
     And user "Alice" has uploaded file with content "some data" to "lorem.txt"
 
-
+  @issue-11690
   Scenario: get daily grouped email notification
     Given user "Brian" has set the email sending interval to "daily" using the settings API
     And user "Alice" has sent the following resource share invitation:
@@ -34,6 +34,7 @@ Feature: get grouped email notification
       | 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 triggered the share expiration notification for file "lorem.txt"
     And user "Alice" has sent the following space share invitation:
       | space           | New-Space    |
       | sharee          | Brian        |
@@ -62,7 +63,10 @@ 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 share to "lorem.txt" has expired at %expiry_date_in_mail%
+      Alice Hansen has shared "lorem.txt" with you.
+
+
+      Your share to lorem.txt has expired at %expiry_date_in_mail%
 
       Even though this share has been revoked you still might have access through other shares and/or space memberships.
 
@@ -83,7 +87,7 @@ Feature: get grouped email notification
       Even though this membership has expired you still might have access through other shares and/or space memberships
       """
 
-
+  @issue-11690
   Scenario: get weekly grouped email notification
     Given user "Brian" has set the email sending interval to "weekly" using the settings API
     And user "Alice" has sent the following resource share invitation:
@@ -101,6 +105,7 @@ Feature: get grouped email notification
       | 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 triggered the share expiration notification for file "lorem.txt"
     And user "Alice" has sent the following space share invitation:
       | space           | New-Space    |
       | sharee          | Brian        |
@@ -129,7 +134,10 @@ 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 share to "lorem.txt" has expired at %expiry_date_in_mail%
+      Alice Hansen has shared "lorem.txt" with you.
+
+
+      Your share to lorem.txt has expired at %expiry_date_in_mail%
 
       Even though this share has been revoked you still might have access through other shares and/or space memberships.