MDL-60975 behat tests: Added search for admin setting filepickers

NoelDeMartin · Dec 5, 2019 · 4805a5b · 4805a5b
1 parent 800563e
commit 4805a5b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/repository/upload/tests/behat/behat_repository_upload.php b/repository/upload/tests/behat/behat_repository_upload.php
@@ -204,12 +204,15 @@ protected function get_filepicker_node($filepickerelement) {
                     $exception
             );
         } else {
-            // Gets the filemanager node specified by the locator which contains the filepicker container.
+            // Gets the filemanager node specified by the locator which contains the filepicker container
+            // either for filepickers created by mform or by admin config.
             $filepickerelement = behat_context_helper::escape($filepickerelement);
             $filepickercontainer = $this->find(
                     'xpath',
                     "//input[./@id = //label[normalize-space(.)=$filepickerelement]/@for]" .
-                    "//ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' felement ')]",
+                    "//ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' felement ')] |" .
+                    "//input[./@id = //label[normalize-space(.)=$filepickerelement]/@for]" .
+                    "//ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-setting ')]",
                     $exception
             );
         }