Fix breaking changes of nc/vue update

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/tests/acceptance/features/bootstrap/AppNavigationContext.php b/tests/acceptance/features/bootstrap/AppNavigationContext.php
index 427af0e40c9..df6ed228960 100644
--- a/tests/acceptance/features/bootstrap/AppNavigationContext.php
+++ b/tests/acceptance/features/bootstrap/AppNavigationContext.php
@@ -31,7 +31,7 @@ class AppNavigationContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function appNavigation() {
-		return Locator::forThe()->id("app-navigation")->
+		return Locator::forThe()->xpath("//*[@id=\"app-navigation\" or contains(@class, 'app-navigation')]")->
 			describedAs("App navigation");
 	}
 
diff --git a/tests/acceptance/features/bootstrap/AppsManagementContext.php b/tests/acceptance/features/bootstrap/AppsManagementContext.php
index 1e36ac72ef6..1f3b2dbe28a 100644
--- a/tests/acceptance/features/bootstrap/AppsManagementContext.php
+++ b/tests/acceptance/features/bootstrap/AppsManagementContext.php
@@ -59,7 +59,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function bundleButton($bundle) {
-		return Locator::forThe()->xpath("//main[@id='app-content']//div[@class='apps-header']/h2[normalize-space() = '$bundle']/input")->
+		return Locator::forThe()->xpath("//main[@id='app-content' or contains(@class, 'app-content')]//div[@class='apps-header']/h2[normalize-space() = '$bundle']/input")->
 		describedAs("Button to enable / disable bundles");
 	}
 
@@ -67,7 +67,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function rowForApp($app) {
-		return Locator::forThe()->xpath("//main[@id='app-content']//div[@class='app-name'][normalize-space() = '$app']/..")->
+		return Locator::forThe()->xpath("//main[@id='app-content' or contains(@class, 'app-content')]//div[@class='app-name'][normalize-space() = '$app']/..")->
 				describedAs("Row for app $app in Apps Management");
 	}
 
@@ -75,7 +75,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function emptyAppList() {
-		return Locator::forThe()->xpath("//main[@id='app-content']//div[@id='apps-list-empty']")->
+		return Locator::forThe()->xpath("//main[@id='app-content' or contains(@class, 'app-content')]//div[@id='apps-list-empty']")->
 			describedAs("Empty apps list view");
 	}
 
@@ -83,7 +83,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function appEntries() {
-		return Locator::forThe()->xpath("//main[@id='app-content']//div[@class='section']")->
+		return Locator::forThe()->xpath("//main[@id='app-content' or contains(@class, 'app-content')]//div[@class='section']")->
 			describedAs("Entries in apps list");
 	}
 
@@ -109,7 +109,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function sidebar() {
-		return Locator::forThe()->id("app-sidebar")->
+		return Locator::forThe()->xpath("//*[@id=\"app-sidebar\" or contains(@class, 'app-sidebar')]")->
 		describedAs("Sidebar in apps management");
 	}
 
diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php
index a5dcfb700ba..906a57b9e61 100644
--- a/tests/acceptance/features/bootstrap/FilesAppContext.php
+++ b/tests/acceptance/features/bootstrap/FilesAppContext.php
@@ -80,7 +80,7 @@ class FilesAppContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function detailsView() {
-		return Locator::forThe()->id("app-sidebar")->
+		return Locator::forThe()->xpath("//*[@id=\"app-sidebar\" or contains(@class, 'app-sidebar')]")->
 				describedAs("Details view in Files app");
 	}
 
diff --git a/tests/acceptance/features/bootstrap/SettingsMenuContext.php b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
index 485f945f04c..678d7c5eabb 100644
--- a/tests/acceptance/features/bootstrap/SettingsMenuContext.php
+++ b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
@@ -88,7 +88,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	private static function settingsPanelFor($itemText) {
-		return Locator::forThe()->xpath("//div[@id = 'app-navigation']//ul//li[@class = 'app-navigation-caption' and normalize-space() = '$itemText']")->
+		return Locator::forThe()->xpath("//div[@id = 'app-navigation' or contains(@class, 'app-navigation')]//ul//li[@class = 'app-navigation-caption' and normalize-space() = '$itemText']")->
 		describedAs($itemText . " item in Settings panel");
 	}
 
@@ -97,7 +97,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	private static function settingsPanelEntryFor($itemText) {
-		return Locator::forThe()->xpath("//div[@id = 'app-navigation']//ul//li[normalize-space() = '$itemText']")->
+		return Locator::forThe()->xpath("//div[@id = 'app-navigation' or contains(@class, 'app-navigation')]//ul//li[normalize-space() = '$itemText']")->
 		describedAs($itemText . " entry in Settings panel");
 	}
 
diff --git a/tests/acceptance/features/bootstrap/ToastContext.php b/tests/acceptance/features/bootstrap/ToastContext.php
index 62b15c74c71..5a67d7f2581 100644
--- a/tests/acceptance/features/bootstrap/ToastContext.php
+++ b/tests/acceptance/features/bootstrap/ToastContext.php
@@ -39,7 +39,7 @@ class ToastContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	private static function toastContainer() {
-		return Locator::forThe()->id("content")->
+		return Locator::forThe()->xpath("//*[@id=\"content\" or contains(@class, 'content')]")->
 				describedAs("Toast container");
 	}