[stable9.1] Add missing unit tests (#25936)

* Adjust unit test execution after folder rename

* Adjust login controller tests to match current behavior

* Fix broken unit tests

2 files changed, 21 insertions, 3 deletions

diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 1bff58cfc4e..6eb561630a3 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -174,7 +174,7 @@ class AvatarController extends Controller {
 		} elseif (!is_null($files)) {
 			if (
 				$files['error'][0] === 0 &&
-				 is_uploaded_file($files['tmp_name'][0]) &&
+				$this->isUploadFile($files['tmp_name'][0]) &&
 				!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
 			) {
 				if ($files['size'][0] > 20*1024*1024) {
@@ -324,4 +324,12 @@ class AvatarController extends Controller {
 			return new DataResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
 		}
 	}
+
+	/**
+	 * @param string $file
+	 * @return bool
+	 */
+	protected function isUploadFile($file) {
+		return is_uploaded_file($file);
+	}
 }
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index fa41af67b89..e2832be91bd 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -106,7 +106,7 @@ class LoginController extends Controller {
 	 */
 	public function showLoginForm($user, $redirect_url, $remember_login) {
 		if ($this->userSession->isLoggedIn()) {
-			return new RedirectResponse(OC_Util::getDefaultPageUrl());
+			return new RedirectResponse($this->getDefaultUrl());
 		}
 
 		$parameters = array();
@@ -196,6 +196,9 @@ class LoginController extends Controller {
 		$this->userSession->login($user, $password);
 		$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password);
 
+		// User has successfully logged in, now remove the password reset link, when it is available
+		$this->config->deleteUserValue($loginResult->getUID(), 'owncloud', 'lostpassword');
+
 		if ($this->twoFactorManager->isTwoFactorAuthenticated($loginResult)) {
 			$this->twoFactorManager->prepareTwoFactorLogin($loginResult);
 			if (!is_null($redirect_url)) {
@@ -215,7 +218,14 @@ class LoginController extends Controller {
 			}
 		}
 
-		return new RedirectResponse(OC_Util::getDefaultPageUrl());
+		return new RedirectResponse($this->getDefaultUrl());
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getDefaultUrl() {
+		return OC_Util::getDefaultPageUrl();
 	}
 
 }