Merge pull request #10254 from nextcloud/backport/10229/master

fix(CI): Fix resetting users between tests when a guest was created

Author: nickvergessen

tests/integration/features/bootstrap/FeatureContext.php

@@ -196,7 +196,7 @@ public function tearDown() {
 			$this->deleteGroup($group);
 		}
 		foreach ($this->createdGuestAccountUsers as $user) {
-			$this->deleteUser($user);
+			$this->deleteGuestUser($user);
 		}
 	}
 
@@ -3019,7 +3019,7 @@ public function createGuestUser($email) {
 		]);
 		Assert::assertEquals(0, $lastCode, 'Guest creation succeeded for ' . $email);
 
-		$this->createdGuestAccountUsers[] = $email;
+		$this->createdGuestAccountUsers[$email] = $email;
 		$this->setCurrentUser($currentUser);
 	}
 
@@ -3045,7 +3045,7 @@ private function createUser($user) {
 		$this->sendRequest('GET', '/cloud/users' . '/' . $user);
 		$this->assertStatusCode($this->response, 200, 'Failed to do first login');
 
-		$this->createdUsers[] = $user;
+		$this->createdUsers[$user] = $user;
 
 		$this->setCurrentUser($currentUser);
 	}
@@ -3073,7 +3073,18 @@ private function deleteUser($user) {
 		$this->sendRequest('DELETE', '/cloud/users/' . $user);
 		$this->setCurrentUser($currentUser);
 
-		unset($this->createdUsers[array_search($user, $this->createdUsers, true)]);
+		unset($this->createdUsers[$user]);
+
+		return $this->response;
+	}
+
+	private function deleteGuestUser($user) {
+		$currentUser = $this->currentUser;
+		$this->setCurrentUser('admin');
+		$this->sendRequest('DELETE', '/cloud/users/' . $user);
+		$this->setCurrentUser($currentUser);
+
+		unset($this->createdGuestAccountUsers[$user]);
 
 		return $this->response;
 	}
@@ -3114,7 +3125,7 @@ public function assureGroupExists($group) {
 
 		$this->setCurrentUser($currentUser);
 
-		$this->createdGroups[] = $group;
+		$this->createdGroups[$group] = $group;
 	}
 
 	/**
@@ -3139,7 +3150,7 @@ private function deleteGroup($group) {
 		$this->sendRequest('DELETE', '/cloud/groups/' . $group);
 		$this->setCurrentUser($currentUser);
 
-		unset($this->createdGroups[array_search($group, $this->createdGroups, true)]);
+		unset($this->createdGroups[$group]);
 	}
 
 	/**

tests/integration/run.sh

@@ -45,6 +45,12 @@ export TEST_REMOTE_URL="http://localhost:8180/"
 OVERWRITE_CLI_URL=$(${ROOT_DIR}/occ config:system:get overwrite.cli.url)
 ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "http://localhost:8080/"
 
+SKELETON_DIR=$(${ROOT_DIR}/occ config:system:get skeletondirectory)
+if [[ "$SKELETON_DIR" ]]; then
+	echo "Resetting custom skeletondirectory so that tests pass"
+	${ROOT_DIR}/occ config:system:delete skeletondirectory
+fi
+
 echo ''
 echo '#'
 echo '# Setting up apps'
@@ -96,6 +102,9 @@ kill $PHPPID2
 
 ${ROOT_DIR}/occ app:disable spreedcheats
 ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value $OVERWRITE_CLI_URL
+if [[ "$SKELETON_DIR" ]]; then
+	${ROOT_DIR}/occ config:system:set skeletondirectory --value "$SKELETON_DIR"
+fi
 rm -rf ../../../spreedcheats
 
 wait $PHPPID1