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

Merge branch 'wip-mdl-50481' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-06-30 12:25:52 +02:00
commit 0b45c56da1
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grade/tests/behat/behat_grade.php
View File

@ -107,7 +107,9 @@ class behat_grade extends behat_base {
$steps[] = new Given('I click on "' . $this->escape($linkxpath) . '" "xpath_element"');
// After adding id numbers we should wait until the page is reloaded.
$steps[] = new Given('I wait until the page is ready');
if ($this->running_javascript()) {
$steps[] = new Given('I wait until the page is ready');
}
// Mapping names to idnumbers.
$datahash = $data->getRowsHash();
@ -116,8 +118,8 @@ class behat_grade extends behat_base {
// Grrr, we can't equal in categoryitem and courseitem because there is a line jump...
$inputxpath ="//input[@class='idnumber'][" .
"parent::li[@class='item'][text()='" . $gradeitem . "']" .
" | " .
"parent::li[@class='categoryitem' | @class='courseitem']/parent::ul/parent::li[starts-with(text(),'" . $gradeitem . "')]" .
" or " .
"parent::li[@class='categoryitem' or @class='courseitem']/parent::ul/parent::li[starts-with(text(),'" . $gradeitem . "')]" .
"]";
$steps[] = new Given('I set the field with xpath "' . $inputxpath . '" to "' . $idnumber . '"');
}
@ -125,7 +127,9 @@ class behat_grade extends behat_base {
$steps[] = new Given('I press "' . get_string('addidnumbers', 'grades') . '"');
// After adding id numbers we should wait until the page is reloaded.
$steps[] = new Given('I wait until the page is ready');
if ($this->running_javascript()) {
$steps[] = new Given('I wait until the page is ready');
}
$steps[] = new Given('I set the field "' . get_string('calculation', 'grades') . '" to "' . $calculation . '"');
$steps[] = new Given('I press "' . $savechanges . '"');

1
grade/tests/behat/grade_minmax.feature
View File

@ -4,7 +4,6 @@ Feature: We can choose what min or max grade to use when aggregating grades.
As an teacher
I can update modify a course setting
@javascript
Scenario: Changing the min or max grade to use updates the grades accordingly
Given the following "courses" exist:
| fullname | shortname | category | groupmode |

7
lib/tests/behat/behat_forms.php
View File

@ -394,7 +394,12 @@ class behat_forms extends behat_base {
);
if (!$this->running_javascript()) {
$actions[] = new Given('I press "' . get_string('go') . '"');
// Press button in the specified select container.
$containerxpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' singleselect ') and " .
".//label[contains(normalize-space(string(.)), '" . $singleselect . "')]]";
$actions[] = new Given('I click on "' . get_string('go') . '" "button" in the "' . $containerxpath .
'" "xpath_element"');
}
return $actions;