More meaningfull message when a public authenticated share's password is wrong or...

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>

diff --git a/core/templates/publicshareauth.php b/core/templates/publicshareauth.php
index 74303ce02ea556386a52b9cbed1aa822fb0c4f25..46e43b3c218f1a75239d9680e47bcc1eeba19ff1 100644 (file)
--- 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 6e4957c9ce37a15cd6d5beac91178b02f88824d0..d31d6541335ef9609b8afb1babc24e2743a572d2 100644 (file)
--- 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");
        }