From a93bb0ff45131c12f0825f97cd673d6e0e8f0c3a Mon Sep 17 00:00:00 2001
From: Prarup Gurung <grgprarup@gmail.com>
Date: Thu, 20 Jun 2024 11:34:53 +0545
Subject: [PATCH] Removed failing ocs scenarios, removed from expected failure

---
 .../expected-failures-API-on-OCIS-storage.md       |  5 -----
 tests/acceptance/features/bootstrap/Sharing.php    |  4 ++--
 .../coreApiShareUpdateToShares/updateShare.feature | 14 +++++---------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 1df96b9d6..1bb45876a 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -88,11 +88,6 @@ Synchronization features like etag propagation, setting mtime and locking files
 - [coreApiTrashbin/trashbinSharingToShares.feature:241](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L241)
 - [coreApiTrashbin/trashbinSharingToShares.feature:269](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L269)
 
-#### [Edit user share response has a "name" field](https://github.com/owncloud/ocis/issues/1225)
-
-- [coreApiShareUpdateToShares/updateShare.feature:200](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature#L200)
-- [coreApiShareUpdateToShares/updateShare.feature:201](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature#L201)
-
 ### Other
 
 API, search, favorites, config, capabilities, not existing endpoints, CORS and others
diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
index 5ab28efcc..78ebfb3cc 100755
--- a/tests/acceptance/features/bootstrap/Sharing.php
+++ b/tests/acceptance/features/bootstrap/Sharing.php
@@ -2437,9 +2437,9 @@ trait Sharing {
 		$this->verifyTableNodeColumnsCount($body, 2);
 		$bodyRows = $body->getRowsHash();
 		foreach ($bodyRows as $field => $value) {
-			if (\in_array($field, ["displayname_owner", "displayname_file_owner", "owner", "uid_owner", "uid_file_owner"])) {
+			if (\in_array($field, ["displayname_owner", "displayname_file_owner", "owner", "uid_owner", "uid_file_owner", "additional_info_owner", "additional_info_file_owner"])) {
 				$value = $this->substituteInLineCodes($value, $sharer);
-			} elseif (\in_array($field, ["share_with", "share_with_displayname", "user"])) {
+			} elseif (\in_array($field, ["share_with", "share_with_displayname", "user", "share_with_additional_info"])) {
 				$value = $this->substituteInLineCodes($value, $sharee);
 			}
 			$value = $this->replaceValuesFromTable($field, $value);
diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
index 6a1ff50b2..1050eaa45 100644
--- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
+++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
@@ -148,7 +148,6 @@ Feature: sharing
     Then the HTTP status code should be "502"
 
   @issue-1253 @issue-1224 @issue-1225
-  #after fixing all the issues merge this scenario with the one below
   Scenario Outline: change the permission of the share and check the API response
     Given using OCS API version "<ocs-api-version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -163,7 +162,7 @@ Feature: sharing
     When user "Alice" updates the last share using the sharing API with
       | permissions | all |
     Then the OCS status code should be "<ocs-status-code>"
-    And the OCS status message should be ""
+    And the OCS status message should be "OK"
     And the HTTP status code should be "200"
     And the fields of the last response to user "Alice" sharing with user "Brian" should include
       | id                         | A_STRING             |
@@ -177,8 +176,8 @@ Feature: sharing
       | token                      |                      |
       | uid_file_owner             | %username%           |
       | displayname_file_owner     | %displayname%        |
-      | additional_info_owner      |                      |
-      | additional_info_file_owner |                      |
+      | additional_info_owner      | %emailaddress%       |
+      | additional_info_file_owner | %emailaddress%       |
       | item_type                  | folder               |
       | item_source                | A_STRING             |
       | path                       | /Alice-folder        |
@@ -189,12 +188,9 @@ Feature: sharing
       | file_target                | /Shares/Alice-folder |
       | share_with                 | %username%           |
       | share_with_displayname     | %displayname%        |
-      | share_with_additional_info |                      |
+      | share_with_additional_info | %emailaddress%       |
       | mail_send                  | 0                    |
-      | attributes                 |                      |
-    And the fields of the last response should not include
-      | name |  |
-      # | token |  |
+      | name                       |                      |
     Examples:
       | ocs-api-version | ocs-status-code |
       | 1               | 100             |