Merge pull request #32683 from nextcloud/backport/32371/stable24

[stable24] More meaningfull message when a public authenticated share's password is wrong or has expired.
nextcloud · Jun 10, 2022 · e2c213a · e2c213a
2 parents 0cbfae6 + bef2960
commit e2c213a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/templates/publicshareauth.php b/core/templates/publicshareauth.php
@@ -17,7 +17,7 @@
 			<div class="warning-info"><?php p($l->t('This share is password-protected')); ?></div>
 		<?php endif; ?>
 		<?php if (isset($_['wrongpw'])): ?>
-			<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
+			<div class="warning wrongPasswordMsg"><?php p($l->t('The password is wrong or expired. Please try again or request a new one.')); ?></div>
 		<?php endif; ?>
 		<p>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>

diff --git a/tests/acceptance/features/bootstrap/PublicShareContext.php b/tests/acceptance/features/bootstrap/PublicShareContext.php
@@ -48,7 +48,7 @@ public static function authenticateButton() {
 	 * @return Locator
 	 */
 	public static function wrongPasswordMessage() {
-		return Locator::forThe()->xpath("//*[@class = 'warning' and normalize-space() = 'The password is wrong. Try again.']")->
+		return Locator::forThe()->css(".warning .wrongPasswordMsg")->
 				describedAs("Wrong password message in Authenticate page");
 	}