Fix master testing and update eslint-config (#17367)

Fix master testing and update eslint-config

2 files changed, 19 insertions, 3 deletions

diff --git a/tests/acceptance/features/app-files-tags.feature b/tests/acceptance/features/app-files-tags.feature
index 4ee7ad7770d..5c0942472a8 100644
--- a/tests/acceptance/features/app-files-tags.feature
+++ b/tests/acceptance/features/app-files-tags.feature
@@ -31,7 +31,7 @@ Feature: app-files-tags
   Scenario: create tags using the Administration settings
     Given I am logged in as the admin
     And I visit the settings page
-    And I open the "Tag management" section
+    And I open the "Workflows" section of the "Administration" group
     # The "create" button does nothing before JavaScript was initialized, and
     # the only way to detect that is waiting for the button to select tags to be
     # shown.
@@ -42,7 +42,7 @@ Feature: app-files-tags
 #  Scenario: add tags using the dropdown in the details view
 #    Given I am logged in as the admin
 #    And I visit the settings page
-#    And I open the "Tag management" section
+#    And I open the "Workflows" section of the "Administration" group
 #    # The "create" button does nothing before JavaScript was initialized, and
 #    # the only way to detect that is waiting for the button to select tags to be
 #    # shown.
@@ -70,7 +70,7 @@ Feature: app-files-tags
 #  Scenario: remove tags using the dropdown in the details view
 #    Given I am logged in as the admin
 #    And I visit the settings page
-#    And I open the "Tag management" section
+#    And I open the "Workflows" section of the "Administration" group
 #    # The "create" button does nothing before JavaScript was initialized, and
 #    # the only way to detect that is waiting for the button to select tags to be
 #    # shown.
diff --git a/tests/acceptance/features/bootstrap/AppNavigationContext.php b/tests/acceptance/features/bootstrap/AppNavigationContext.php
index 356ac0afa46..02a8b1c0152 100644
--- a/tests/acceptance/features/bootstrap/AppNavigationContext.php
+++ b/tests/acceptance/features/bootstrap/AppNavigationContext.php
@@ -48,6 +48,15 @@ class AppNavigationContext implements Context, ActorAwareInterface {
 	/**
 	 * @return Locator
 	 */
+	public static function appNavigationSectionItemInFor($caption, $sectionText) {
+		return Locator::forThe()->xpath("//li[normalize-space() = '$caption']/following-sibling::li/a[normalize-space() = '$sectionText']/..")->
+			descendantOf(self::appNavigation())->
+			describedAs($sectionText . " section item of the $caption group in App Navigation");
+	}
+
+	/**
+	 * @return Locator
+	 */
 	public static function appNavigationCurrentSectionItem() {
 		return Locator::forThe()->css(".active")->
 			descendantOf(self::appNavigation())->
@@ -80,6 +89,13 @@ class AppNavigationContext implements Context, ActorAwareInterface {
 	}
 
 	/**
+	 * @Given I open the :section section of the :caption group
+	 */
+	public function iOpenTheSectionOf($caption, $section) {
+		$this->actor->find(self::appNavigationSectionItemInFor($caption, $section), 10)->click();
+	}
+
+	/**
 	 * @Given I click the :class button on the :section section
 	 */
 	public function iClickTheButtonInTheSection($class, $section) {