From 6f9f05a06eecd13c089a405fa6596b7d0152dcc6 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 17 Apr 2014 13:21:02 +0700 Subject: [PATCH 1/2] MDL-44614 behat: Automate MDLQA-60 A teacher can provide feedback comments and files for an assignment. --- mod/assign/tests/behat/comment_inline.feature | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/mod/assign/tests/behat/comment_inline.feature b/mod/assign/tests/behat/comment_inline.feature index c348986f42d..f4e96fea4f3 100644 --- a/mod/assign/tests/behat/comment_inline.feature +++ b/mod/assign/tests/behat/comment_inline.feature @@ -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" From 23102c3e2e5ce18a6b2d80058c6d914e3c546755 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 17 Apr 2014 13:40:18 +0700 Subject: [PATCH 2/2] MDL-44614 behat: Automate MDLQA-61 In an Offline activity assignment, a teacher can grade and give comments on an assignment completed offline. --- .../tests/behat/submission_comments.feature | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/mod/assign/tests/behat/submission_comments.feature b/mod/assign/tests/behat/submission_comments.feature index eb017567a1d..7bcb5e60a0f 100644 --- a/mod/assign/tests/behat/submission_comments.feature +++ b/mod/assign/tests/behat/submission_comments.feature @@ -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" @@ -39,3 +43,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"