]> source.dussan.org Git - nextcloud-server.git/commitdiff
Adjust acceptance tests to notifications based on toastify 15938/head
authorDaniel Calviño Sánchez <danxuliu@gmail.com>
Wed, 12 Jun 2019 12:32:15 +0000 (14:32 +0200)
committerDaniel Calviño Sánchez <danxuliu@gmail.com>
Wed, 12 Jun 2019 12:32:15 +0000 (14:32 +0200)
The old notifications were added as ".row" elements to the
"#notification-container" element; the new notifications based on
toastify are added as ".toastify .on .toast..." elements to the
"#content" element. Besides that, they also include a span element with
an X to close the notification, so now only the first child text node
should be compared to the expected message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
tests/acceptance/features/bootstrap/NotificationContext.php

index ac9838562e1df3d3896701669c28feedd7e9a44d..717de4302da5805e1fbf550386c4217bbb668d07 100644 (file)
@@ -31,7 +31,7 @@ class NotificationContext implements Context, ActorAwareInterface {
         * @return Locator
         */
        public static function notificationMessage($message) {
-               return Locator::forThe()->xpath("//*[@class = 'row' and normalize-space() = '$message']")->
+               return Locator::forThe()->xpath("//*[contains(concat(' ', normalize-space(@class), ' '), ' toastify ') and normalize-space(text()) = '$message']")->
                                descendantOf(self::notificationContainer())->
                                describedAs("$message notification");
        }
@@ -40,7 +40,7 @@ class NotificationContext implements Context, ActorAwareInterface {
         * @return Locator
         */
        private static function notificationContainer() {
-               return Locator::forThe()->id("notification-container")->
+               return Locator::forThe()->id("content")->
                                describedAs("Notification container");
        }