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

MDL-38939 behat: Allow admin setting to be set in non-JS sessions

Browse Source
This commit is contained in:
David Monllao
2013-04-10 16:51:48 +08:00
parent 70faad655a
commit 6b9c866757
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tests/behat/behat_admin.php
+14 -2
View File
@@ -58,7 +58,7 @@ class behat_admin extends behat_base {
// We expect admin block to be visible, otherwise go to homepage.
if (!$this->getSession()->getPage()->find('css', '.block_settings')) {
$this->getSession()->visit($this->locate_path('/'));
$this->getSession()->wait(self::TIMEOUT, '(document.readyState === "complete")');
$this->wait(self::TIMEOUT, '(document.readyState === "complete")');
}
// Search by label.
@@ -67,7 +67,7 @@ class behat_admin extends behat_base {
$submitsearch = $this->find('css', 'form.adminsearchform input[type=submit]');
$submitsearch->press();
$this->getSession()->wait(self::TIMEOUT, '(document.readyState === "complete")');
$this->wait(self::TIMEOUT, '(document.readyState === "complete")');
// Admin settings does not use the same DOM structure than other moodle forms
// but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.
@@ -94,4 +94,16 @@ class behat_admin extends behat_base {
}
}
/**
* Waits with the provided params if we are running a JS session.
*
* @param int $timeout
* @param string $javascript
* @return void
*/
protected function wait($timeout, $javascript = false) {
if ($this->running_javascript()) {
$this->getSession()->wait($timeout, $javascript);
}
}
}