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

MDL-50481 core_grades: Fixed behat feature and step to work with non-js

Browse Source 
xPath used in step is not using proper oring
and fails with goutee driver. Also, feature don't
really need to be executed in js, so setting that
as non-js
This commit is contained in:
Rajesh Taneja
2015-06-25 13:15:14 +08:00
parent c74f4582c2
commit 6d55d3b4f8
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/tests/behat/behat_grade.php
+8 -4
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 . '"');
grade/tests/behat/grade_minmax.feature
-1
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 |