updated expected failures file

owncloud · Oct 30, 2023 · 6868988 · 6868988
1 parent 5c01e52
commit 6868988
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -591,10 +591,6 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 - [coreApiFavorites/favorites.feature:150](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiFavorites/favorites.feature#L150)
 - [coreApiFavorites/favorites.feature:227](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiFavorites/favorites.feature#L227)
 
-#### [OCS status code zero](https://github.com/owncloud/ocis/issues/3621)
-
-- [coreApiShareManagementToShares/moveReceivedShare.feature:13](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature#L13)
-
 #### [HTTP status code differ while deleting file of another user's trash bin](https://github.com/owncloud/ocis/issues/3544)
 
 - [coreApiTrashbin/trashbinDelete.feature:105](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature#L105)

diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -2291,7 +2291,8 @@ public function userHasBeenDeleted(string $user):void {
 			if ($this->isTestingWithLdap() && \in_array($user, $this->ldapCreatedUsers)) {
 				$this->deleteLdapUser($user);
 			} else {
-				$this->deleteUser($user);
+				$response = $this->deleteUser($user);
+				$this->theHTTPStatusCodeShouldBe(204, "", $response);
 			}
 		}
 		$this->userShouldNotExist($user);
@@ -2664,17 +2665,6 @@ public function userHasBeenCreated(
 		$this->initializeUser($user, $password);
 	}
 
-	/**
-	 * @param string $user
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function cleanUser(string $user):void {
-		$this->deleteUser($user);
-		$this->userShouldNotExist($user);
-	}
-
 	/**
 	 * Try to delete the group, catching anything bad that might happen.
 	 * Use this method only in places where you want to try as best you
@@ -4898,11 +4888,13 @@ public function cleanupDatabaseUsers():void {
 		$previousServer = $this->currentServer;
 		$this->usingServer('LOCAL');
 		foreach ($this->createdUsers as $userData) {
-			$this->cleanUser($userData['actualUsername']);
+			$this->deleteUser($userData['actualUsername']);
+			$this->userShouldNotExist($userData['actualUsername']);
 		}
 		$this->usingServer('REMOTE');
 		foreach ($this->createdRemoteUsers as $userData) {
-			$this->cleanUser($userData['actualUsername']);
+			$this->deleteUser($userData['actualUsername']);
+			$this->userShouldNotExist($userData['actualUsername']);
 		}
 		$this->usingServer($previousServer);
 	}

diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
@@ -19,7 +19,7 @@ Feature: sharing
     And user "Brian" moves folder "/Shares/TMP" to "/Shares/new" using the WebDAV API
     And the administrator deletes user "Carol" using the provisioning API
     Then the OCS status code of responses on all endpoints should be "100"
-    And the HTTP status code of responses on each endpoint should be "200, 200, 200, 201, 204" respectively
+    And the HTTP status code of responses on each endpoint should be "200, 201, 204" respectively
     And user "Brian" should see the following elements
       | /Shares/new/|