moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-68753-master-enfix' of git://github.com/mudrd8mz/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2020-05-28 13:01:39 +02:00
commit 6f56e743ed
47 changed files with 172 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grade/grading/form/guide/tests/behat/edit_guide.feature
View file

@ -83,7 +83,7 @@ Feature: Marking guides can be created and edited
And I wait "1" seconds
Then the field "Guide criterion B criterion remark" matches value "Comment \"4\""
When I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
And I follow "Test assignment 1 name"
And I navigate to "View all submissions" in current page administration

2
grade/grading/tests/behat/behat_grading.php
View file

@ -156,7 +156,7 @@ class behat_grading extends behat_base {
public function i_save_the_advanced_grading_form() {
$this->execute('behat_forms::press_button', get_string('savechanges'));
$this->execute('behat_forms::press_button', 'Ok');
$this->execute('behat_forms::press_button', 'OK');
$this->execute('behat_general::i_click_on', array($this->escape(get_string('editsettings')), 'link'));
$this->execute('behat_forms::press_button', get_string('cancel'));
$this->execute('behat_navigation::i_navigate_to_in_current_page_administration',

4
grade/report/singleview/tests/behat/bulk_insert_grades.feature
View file

@ -38,7 +38,7 @@ Feature: We can bulk insert grades for students in a course
And I set the following fields to these values:
| Grade out of 100 | 50 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "View > Grader report" in the course gradebook
And I follow "Single view for Test assignment one"
@ -79,7 +79,7 @@ Feature: We can bulk insert grades for students in a course
And I set the following fields to these values:
| Grade out of 100 | 50 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "View > Grader report" in the course gradebook
# And I click on "input[title='Dock Navigation block']" "css_element"

10
grade/tests/behat/grade_scales.feature
View file

@ -55,23 +55,23 @@ Feature: View gradebook when scales are used
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade" to "A"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "B"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "C"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "D"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "F"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "Setup > Course grade settings" in the course gradebook
And I set the field "Show weightings" to "Show"

2
grade/tests/behat/grade_single_item_scales.feature
View file

@ -51,7 +51,7 @@ Feature: View gradebook when single item scales are used
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade" to "A"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "Setup > Course grade settings" in the course gradebook
And I set the field "Show weightings" to "Show"