mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2020-05-26 23:43:05 +02:00
commit 08c6eca7e9
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tests/behat/app_behat_runtime.js
View File

@ -410,7 +410,8 @@
case 'page menu' :
// This lang string was changed in app version 3.6.
selector = 'core-context-menu > button[aria-label=Info], ' +
'core-context-menu > button[aria-label=Information]';
'core-context-menu > button[aria-label=Information], ' +
'core-context-menu > button[aria-label="Display options"]';
break;
default:
return 'ERROR: Unsupported standard button type';

20
lib/tests/behat/behat_app.php
View File

@ -303,12 +303,22 @@ class behat_app extends behat_base {
// Wait until the site login field appears OR the main page.
$situation = $this->spin(
function($context, $args) {
$input = $context->getSession()->getPage()->find('xpath', '//input[@name="url"]');
if ($input) {
$page = $context->getSession()->getPage();
$element = $page->find('xpath', '//page-core-login-site//input[@name="url"]');
if ($element) {
// Wait for the onboarding modal to open, if any.
$this->wait_for_pending_js();
$element = $page->find('xpath', '//page-core-login-site-onboarding');
if ($element) {
$this->i_press_in_the_app('Skip');
}
return 'login';
}
$mainmenu = $context->getSession()->getPage()->find('xpath', '//page-core-mainmenu');
if ($mainmenu) {
$element = $page->find('xpath', '//page-core-mainmenu');
if ($element) {
return 'mainpage';
}
throw new DriverException('Moodle app login URL prompt not found');
@ -317,7 +327,7 @@ class behat_app extends behat_base {
// If it's the login page, we automatically fill in the URL and leave it on the user/pass
// page. If it's the main page, we just leave it there.
if ($situation === 'login') {
$this->i_set_the_field_in_the_app('Site address', $CFG->wwwroot);
$this->i_set_the_field_in_the_app('campus.example.edu', $CFG->wwwroot);
$this->i_press_in_the_app('Connect!');
}