mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44614_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-04-28 13:03:39 +08:00
commit f6db769eb2
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mod/assign/tests/behat/comment_inline.feature
View File

@ -27,6 +27,7 @@ Feature: In an assignment, teachers can edit a students submission inline
| assignsubmission_file_enabled | 0 |
| assignfeedback_comments_enabled | 1 |
| assignfeedback_comments_commentinline | 1 |
| assignfeedback_file_enabled | 1 |
And I log out
And I log in as "student1"
And I follow "Course 1"
@ -41,10 +42,24 @@ Feature: In an assignment, teachers can edit a students submission inline
And I follow "Test assignment name"
And I follow "View/grade all submissions"
And I click on "Grade Student 1" "link" in the "Student 1" "table_row"
And I set the following fields to these values:
| Grade out of 100 | 50 |
| Feedback comments | I'm the teacher feedback |
And I upload "lib/tests/fixtures/empty.txt" file to "Feedback files" filemanager
And I press "Save changes"
And I press "Continue"
Then I should see "50.00" in the "Student 1" "table_row"
And I should see "Submitted for grading" in the "Student 1" "table_row"
And I should see "Graded" in the "Student 1" "table_row"
And I should see "I'm the student first submission" in the "Student 1" "table_row"
And I should see "I'm the teacher feedback" in the "Student 1" "table_row"
And I should see "empty.txt" in the "Student 1" "table_row"
And I log out
When I log in as "student1"
And I log in as "student1"
And I follow "Course 1"
And I follow "Test assignment name"
And I should see "I'm the student first submission" in the "Feedback comments" "table_row"
And I should see "Submitted for grading" in the "Submission status" "table_row"
And I should see "Graded" in the "Grading status" "table_row"
And I should see "I'm the student first submission" in the "Online text" "table_row"
And I should see "I'm the teacher feedback" in the "Feedback comments" "table_row"
And I should see "empty.txt" in the "Feedback files" "table_row"

28
mod/assign/tests/behat/submission_comments.feature
View File

@ -4,18 +4,22 @@ Feature: In an assignment, students can comment in their submissions
As a student
I need to add comments about submissions
@javascript
Scenario: Student comments an assignment submission
Background:
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@asd.com |
| student1 | Student | 1 | student1@asd.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And the following "activities" exist:
@javascript
Scenario: Student comments an assignment submission
Given the following "activities" exist:
| activity | course | idnumber | name | intro | assignsubmission_onlinetext_enabled |
| assign | C1 | assign1 | Test assignment name | Test assignment description | 1 |
And I log in as "student1"
@ -41,3 +45,21 @@ Feature: In an assignment, students can comment in their submissions
And I click on ".comment-link" "css_element"
And I should see "Second student comment"
And I should not see "First student comment"
@javascript
Scenario: Teacher can comment on an offline assignment
Given the following "activities" exist:
| activity | course | idnumber | name | intro | assignsubmission_onlinetext_enabled | assignmentsubmission_file_enabled | assignfeedback_comments_enabled |
| assign | C1 | assign1 | Test assignment name | Test assignment description | 0 | 0 | 1 |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test assignment name"
And I follow "View/grade all submissions"
And I click on "Grade Student 1" "link" in the "Student 1" "table_row"
When I set the following fields to these values:
| Grade out of 100 | 50 |
| Feedback comments | I'm the teacher feedback |
And I press "Save changes"
And I press "Continue"
Then I should see "50.00" in the "Student 1" "table_row"
And I should see "I'm the teacher feedback" in the "Student 1" "table_row"