From: Daniel Calviño Sánchez <danxuliu@gmail.com>
Date: Wed, 12 Jun 2019 12:32:15 +0000 (+0200)
Subject: Adjust acceptance tests to notifications based on toastify
X-Git-Tag: v17.0.0beta1~312^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df8406dbae7e5d5bae77af969b0e2d25102dfbe6;p=nextcloud-server.git

Adjust acceptance tests to notifications based on toastify

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>
---

diff --git a/tests/acceptance/features/bootstrap/NotificationContext.php b/tests/acceptance/features/bootstrap/NotificationContext.php
index ac9838562e1..717de4302da 100644
--- a/tests/acceptance/features/bootstrap/NotificationContext.php
+++ b/tests/acceptance/features/bootstrap/NotificationContext.php
@@ -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");
 	}