Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2022-06-11 01:32:32 +0300
committerGitHub <noreply@github.com>2022-06-11 01:32:32 +0300
commite2c213a4269244d1656c05fc3eb4fee4f32a4f21 (patch)
tree7c7df324aef534016fde0c0ca1860f78c367d02f
parent0cbfae6c37724b7d67e986f4018fb91167cc5c3f (diff)
parentbef2960abfd633a4f8e18bbf14508e383bd76c53 (diff)
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.
-rw-r--r--core/templates/publicshareauth.php2
-rw-r--r--tests/acceptance/features/bootstrap/PublicShareContext.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/templates/publicshareauth.php b/core/templates/publicshareauth.php
index 03b534f53da..449216bb6f6 100644
--- 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
index 2895202ed7f..554f8ab5a5d 100644
--- a/tests/acceptance/features/bootstrap/PublicShareContext.php
+++ b/tests/acceptance/features/bootstrap/PublicShareContext.php
@@ -48,7 +48,7 @@ class PublicShareContext implements Context, ActorAwareInterface {
* @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");
}