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

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

apps/files_sharing/tests/EncryptedSizePropagationTest.php

@@ -18,12 +18,17 @@ class EncryptedSizePropagationTest extends SizePropagationTest {
 	use EncryptionTrait;
 
 	protected function setupUser($name, $password = '') {
+		$this->config->setAppValue('encryption', 'useMasterKey', '0');
 		$this->createUser($name, $password);
 		$tmpFolder = Server::get(ITempManager::class)->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);
+	}
 }

apps/files_sharing/tests/TestCase.php

@@ -108,7 +108,7 @@ abstract class TestCase extends \Test\TestCase {
 		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');
@@ -173,7 +173,7 @@ abstract class TestCase extends \Test\TestCase {
 	 * @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;
 		}