fix(tests): Avoid user login before a private key is setup

Signed-off-by: Côme Chilliet <[email protected]>
nextcloud · Nov 28, 2024 · 2a1e5fd · 2a1e5fd
1 parent f812d3d
commit 2a1e5fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/apps/files_sharing/tests/EncryptedSizePropagationTest.php b/apps/files_sharing/tests/EncryptedSizePropagationTest.php
@@ -16,12 +16,17 @@ class EncryptedSizePropagationTest extends SizePropagationTest {
 	use EncryptionTrait;
 
 	protected function setupUser($name, $password = '') {
+		$this->config->setAppValue('encryption', 'useMasterKey', '0');
 		$this->createUser($name, $password);
 		$tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
 		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-		$this->config->setAppValue('encryption', 'useMasterKey', '0');
 		$this->setupForUser($name, $password);
 		$this->loginWithEncryption($name);
 		return new View('/' . $name . '/files');
 	}
+
+	protected function loginHelper($user, $create = false, $password = false) {
+		$this->setupForUser($user, $password);
+		parent::loginHelper($user, $create, $password);
+	}
 }
diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
@@ -102,7 +102,7 @@ protected function setUp(): void {
 		\OC::$server->get(DisplayNameCache::class)->clear();
 
 		//login as user1
-		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->data = 'foobar';
 		$this->view = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
@@ -167,7 +167,7 @@ public static function tearDownAfterClass(): void {
 	 * @param bool $create
 	 * @param bool $password
 	 */
-	protected static function loginHelper($user, $create = false, $password = false) {
+	protected function loginHelper($user, $create = false, $password = false) {
 		if ($password === false) {
 			$password = $user;
 		}