L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-66979 behat: iFrames must have a name for switchTo

Browse Source 
The W3C WebDriver protocol supports switching of contexts using a named
context, and not the class asscoiated with that context.
This commit is contained in:
Andrew Nicols
2021-01-22 14:52:21 +08:00
parent deaab14bf9
commit 18d5ddf01d
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/behat/classes/partial_named_selector.php
+1 -1
View File
@@ -235,7 +235,7 @@ XPATH
.//descendant::input[@id = //label[contains(normalize-space(string(.)), %locator%)]/@for]/ancestor::*[@data-fieldtype = 'autocomplete']
XPATH
, 'iframe' => <<<XPATH
.//iframe[contains(concat(' ', normalize-space(@class), ' '), %locator% )]
.//iframe[(%idOrNameMatch% or (contains(concat(' ', normalize-space(@class), ' '), %locator% )))]
XPATH
);
lib/tests/behat/behat_general.php
+11 -30
View File
@@ -159,49 +159,30 @@ class behat_general extends behat_base {
* Switches to the specified iframe.
*
* @Given /^I switch to "(?P<iframe_name_string>(?:[^"]|\\")*)" iframe$/
* @param string $iframename
*/
public function switch_to_iframe($iframename) {
// We spin to give time to the iframe to be loaded.
// Using extended timeout as we don't know about which
// kind of iframe will be loaded.
$this->spin(
function($context, $iframename) {
$context->getSession()->switchToIFrame($iframename);
// If no exception we are done.
return true;
},
$iframename,
behat_base::get_extended_timeout()
);
}
/**
* Switches to the iframe containing specified class.
*
* @Given /^I switch to "(?P<iframe_name_string>(?:[^"]|\\")*)" class iframe$/
* @param string $classname
* @param string $name The name of the iframe
*/
public function switch_to_class_iframe($classname) {
public function switch_to_iframe($name) {
// We spin to give time to the iframe to be loaded.
// Using extended timeout as we don't know about which
// kind of iframe will be loaded.
$this->spin(
function($context, $classname) {
$iframe = $this->find('iframe', $classname);
if (!empty($iframe->getAttribute('id'))) {
$iframename = $iframe->getAttribute('id');
} else {
function($context) use ($name){
$iframe = $context->find('iframe', $name);
if ($iframe->hasAttribute('name')) {
$iframename = $iframe->getAttribute('name');
} else {
if (!$this->running_javascript()) {
throw new \coding_exception('iframe must have a name attribute to use the switchTo command.');
}
$iframename = uniqid();
$this->execute_js_on_node($iframe, "{{ELEMENT}}.name = '{$iframename}';");
}
$context->getSession()->switchToIFrame($iframename);
// If no exception we are done.
return true;
},
$classname,
behat_base::get_extended_timeout()
);
}