moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-68048-master-behatnotfound' of git://github.com/mudrd8mz/moodle

Browse source
This commit is contained in:
Sara Arjona 2020-03-03 17:01:33 +01:00
commit 07b6ae5f3a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/tests/behat/behat_navigation.php
View file

@ -861,7 +861,7 @@ class behat_navigation extends behat_base {
$linkname = behat_context_helper::escape($lastnode);
$xpath .= '//a[contains(normalize-space(.), ' . $linkname . ')]';
if (!$node = $this->getSession()->getPage()->find('xpath', $xpath)) {
throw new ElementNotFoundException($this->getSession(), 'Link "' . join(' > ', $nodelist) . '"" not found on the page');
throw new ElementNotFoundException($this->getSession(), 'Link "' . join(' > ', $nodelist) . '"');
}
$node->click();
$this->wait_for_pending_js();
@ -876,7 +876,7 @@ class behat_navigation extends behat_base {
protected function find_header_administration_menu($mustexist = false) {
$menuxpath = '//header[@id=\'page-header\']//div[contains(@class,\'moodle-actionmenu\')]';
if ($mustexist) {
$exception = new ElementNotFoundException($this->getSession(), 'Page header administration menu is not found');
$exception = new ElementNotFoundException($this->getSession(), 'Page header administration menu');
$this->find('xpath', $menuxpath, $exception);
} else if (!$this->getSession()->getPage()->find('xpath', $menuxpath)) {
return null;
@ -893,7 +893,7 @@ class behat_navigation extends behat_base {
protected function find_page_administration_menu($mustexist = false) {
$menuxpath = '//div[@id=\'region-main-settings-menu\']';
if ($mustexist) {
$exception = new ElementNotFoundException($this->getSession(), 'Page administration menu is not found');
$exception = new ElementNotFoundException($this->getSession(), 'Page administration menu');
$this->find('xpath', $menuxpath, $exception);
} else if (!$this->getSession()->getPage()->find('xpath', $menuxpath)) {
return null;
@ -960,6 +960,6 @@ class behat_navigation extends behat_base {
}
throw new ElementNotFoundException($this->getSession(),
'Link "' . join(' > ', $nodelist) . '" not found in the current page edit menu"');
'Link "' . join(' > ', $nodelist) . '" in the current page edit menu"');
}
}

2
theme/classic/tests/behat/behat_theme_classic_behat_navigation.php
View file

@ -217,7 +217,7 @@ class behat_theme_classic_behat_navigation extends behat_navigation {
$menuxpath = "//section[contains(@class,'block_settings')]//div[@id='settingsnav']/ul[1]/li[1]";
if ($mustexist) {
$exception = new ElementNotFoundException($this->getSession(), 'Page administration menu is not found');
$exception = new ElementNotFoundException($this->getSession(), 'Page administration menu');
$this->find('xpath', $menuxpath, $exception);
} else if (!$this->getSession()->getPage()->find('xpath', $menuxpath)) {