mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-58092-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2017-03-28 10:56:00 +01:00
commit c7c96ddc7c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/grading/form/guide/renderer.php
View File

@ -249,7 +249,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
foreach ($comments as $id => $comment) {
$commentoption = new stdClass();
$commentoption->id = $id;
$commentoption->description = s($comment['description']);
$commentoption->description = $comment['description'];
$commentoptions[] = $commentoption;
}

12
grade/grading/form/guide/tests/behat/edit_guide.feature
View File

@ -37,7 +37,7 @@ Feature: Marking guides can be created and edited
| Comment 1 |
| Comment 2 |
| Comment 3 |
| Comment 4 |
| Comment "4" |
And I press "Save marking guide and make it ready"
Then I should see "Ready for use"
And I should see "Guide criterion A"
@ -46,7 +46,7 @@ Feature: Marking guides can be created and edited
And I should see "Comment 1"
And I should see "Comment 2"
And I should see "Comment 3"
And I should see "Comment 4"
And I should see "Comment \"4\""
@javascript
Scenario: Deleting criterion and comment
@ -66,7 +66,7 @@ Feature: Marking guides can be created and edited
And I press "Save"
Then I should see "Comment 1"
And I should see "Comment 2"
And I should see "Comment 4"
And I should see "Comment \"4\""
But I should not see "Comment 3"
@javascript
@ -80,9 +80,9 @@ Feature: Marking guides can be created and edited
# Inserting frequently used comment.
And I click on "Insert frequently used comment" "button" in the "Guide criterion B" "table_row"
And I wait "1" seconds
And I press "Comment 4"
And I press "Comment \"4\""
And I wait "1" seconds
Then the field "Guide criterion B criterion remark" matches value "Comment 4"
Then the field "Guide criterion B criterion remark" matches value "Comment \"4\""
When I press "Save changes"
And I press "Ok"
And I follow "Edit settings"
@ -98,7 +98,7 @@ Feature: Marking guides can be created and edited
And I should see "80" in the ".feedback" "css_element"
And I should see "Marking guide test description" in the ".feedback" "css_element"
And I should see "Very good"
And I should see "Comment 4"
And I should see "Comment \"4\""
And I should see "Nice!"
Scenario: I can use marking guides to grade and edit them later updating students grades with Javascript disabled