remove flaky scenario

owncloud · Feb 11, 2025 · fa0478f · fa0478f
1 parent a0612ce
commit fa0478f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 70 deletions.
diff --git a/tests/acceptance/bootstrap/SharingNgContext.php b/tests/acceptance/bootstrap/SharingNgContext.php
@@ -2135,46 +2135,4 @@ public function userListsPermissionsWithFollowingFiltersForFileOrFolderOfTheSpac
 			$this->getPermissionsList($user, $fileOrFolder, $space, $resource, $query)
 		);
 	}
-
-	/**
-	 * @When user :user expires the last created share:
-	 *
-	 * @param string $user
-	 * @param TableNode $table
-	 *
-	 * @return void
-	 */
-	public function userExpiresTheLastCreatedShare(string $user, TableNode $table): void {
-		$permissionID = $this->featureContext->shareNgGetLastCreatedUserGroupShareID();
-		$bodyRows = $table->getRowsHash();
-		if ($bodyRows['space'] === 'Personal' || $bodyRows['space'] === 'Shares') {
-			$space = $this->spacesContext->getSpaceByName($user, $bodyRows['space']);
-		} else {
-			$space = $this->spacesContext->getCreatedSpace($bodyRows['space']);
-		}
-		$spaceId = $space["id"];
-
-		$resource = $bodyRows['resource'] ?? '';
-		if ($resource === '' && !\in_array($bodyRows['space'], ['Personal', 'Shares'])) {
-			$itemId = $space['fileId'];
-		} else {
-			$itemId = $this->spacesContext->getResourceId($user, $bodyRows['space'], $resource);
-		}
-		$body = [];
-		$dateTime = new DateTime("now", new DateTimeZone("UTC"));
-		$body['expirationDateTime'] = $dateTime->modify('-5 minutes')->format('Y-m-d\TH:i:s\Z');
-
-		$this->featureContext->setResponse(
-			GraphHelper::updateShare(
-				$this->featureContext->getBaseUrl(),
-				$this->featureContext->getStepLineRef(),
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$spaceId,
-				$itemId,
-				\json_encode($body),
-				$permissionID
-			)
-		);
-	}
 }
diff --git a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
@@ -324,8 +324,5 @@ The expected failures in this file are from features in the owncloud/ocis repo.
 - [apiServiceAvailability/serviceAvailabilityCheck.feature:116](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiServiceAvailability/serviceAvailabilityCheck.feature#L116)
 - [apiServiceAvailability/serviceAvailabilityCheck.feature:125](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiServiceAvailability/serviceAvailabilityCheck.feature#L125)
 
-### [Multiple in-app and mail notification generated for Share Expired event of resource inside Project drive ](https://github.com/owncloud/ocis/issues/10936)
--[apiNotification/shareExpireNotification.feature:33](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiNotification/shareExpireNotification.feature#L33)
-
 Note: always have an empty line at the end of this file.
 The bash script that processes this file requires that the last line has a newline on the end.
diff --git a/tests/acceptance/features/apiNotification/shareExpireNotification.feature b/tests/acceptance/features/apiNotification/shareExpireNotification.feature
@@ -20,33 +20,9 @@ Feature: Share Expiry Notification
       | shareType          | user                 |
       | permissionsRole    | Viewer               |
       | expirationDateTime | 2025-07-15T14:00:00Z |
-    When user "Alice" expires the last created share:
-      | space    | Personal     |
-      | resource | testfile.txt |
+    When user "Alice" expires the last share of resource "testfile.txt" inside of the space "Personal"
     Then the HTTP status code should be "200"
     And user "Brian" should get a notification with subject "Membership expired" and message:
       | message                           |
       | Access to Space Alice Hansen lost |
     And user "Brian" should have "2" emails
-
-  @issue-10966
-  Scenario: check share expired in-app and mail notification for Project space resource
-    Given using spaces DAV path
-    And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
-    And user "Alice" has created a space "NewSpace" with the default quota using the Graph API
-    And user "Alice" has uploaded a file inside space "NewSpace" with content "share space items" to "testfile.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource           | testfile.txt         |
-      | space              | NewSpace             |
-      | sharee             | Brian                |
-      | shareType          | user                 |
-      | permissionsRole    | Viewer               |
-      | expirationDateTime | 2025-07-15T14:00:00Z |
-    When user "Alice" expires the last created share:
-      | space    | NewSpace     |
-      | resource | testfile.txt |
-    Then the HTTP status code should be "200"
-    And user "Brian" should get a notification with subject "Membership expired" and message:
-      | message                       |
-      | Access to Space NewSpace lost |
-    And user "Brian" should have "2" emails