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

Merge branch 'MDL-66761-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE

Browse Source
This commit is contained in:
Adrian Greeve
2020-01-20 14:47:30 +08:00
parent 68fd5cfaf4 27557f1a55
commit 288d4fc575
3 changed files with 318 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/report/summary/tests/behat/summary_filter_groups.feature
+223
View File
@@ -0,0 +1,223 @@
@mod @mod_forum @forumreport @forumreport_summary
Feature: Groups report filter is available if groups exist
In order to retrieve targeted forum data
As a teacher
I can filter the forum summary report by groups of users
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student1@example.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
| Course 2 | C2 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| teacher1 | C2 | editingteacher |
And the following "groups" exist:
| name | course | idnumber |
| Group A | C1 | G1 |
| Group B | C1 | G2 |
| Group C | C1 | G3 |
| Group D | C1 | G4 |
| Group E | C2 | G5 |
And the following "group members" exist:
| user | group |
| teacher1 | G1 |
| teacher1 | G2 |
| teacher1 | G3 |
| student1 | G3 |
And the following "activities" exist:
| activity | name | description | course | idnumber | groupmode |
| forum | forum1 | C1 first forum | C1 | forum1 | 1 |
| forum | forum2 | C1 second forum | C1 | forum2 | 2 |
| forum | forum1 | C2 first forum | C2 | forum1 | 0 |
And the following forum discussions exist in course "Course 1":
| user | forum | name | message | group | created |
| teacher1 | forum1 | discussion1 | D1 message | G1 | ## 1 month ago ## |
| teacher1 | forum1 | discussion2 | D2 message | G2 | ## 1 week ago ## |
| teacher1 | forum2 | discussion3 | D3 message | G1 | ## 6 days ago ## |
| teacher1 | forum2 | discussion4 | D4 message | G4 | ## 5 days ago ## |
| teacher1 | forum2 | discussion5 | D5 message | All participants | ## 4 days ago ## |
| student1 | forum1 | discussion6 | D6 message | G3 | ## 3 days ago ## |
| student2 | forum2 | discussion7 | D7 message | All participants | ## 2 days ago ## |
And the following forum replies exist in course "Course 1":
| user | forum | discussion | message | created |
| teacher1 | forum1 | discussion1 | D1 reply | ## 3 weeks ago ## |
| teacher1 | forum2 | discussion3 | D3 reply | ## 4 days ago ## |
| teacher1 | forum1 | discussion6 | D6 reply | ## 2 days ago ## |
| student1 | forum1 | discussion6 | D6 reply 2 | ## 2 days ago ## |
| student2 | forum2 | discussion4 | D4 reply | ## 4 days ago ## |
| student2 | forum2 | discussion5 | D5 reply | ## 3 days ago ## |
And the following forum discussions exist in course "Course 2":
| user | forum | name | message | created |
| teacher1 | forum1 | discussion1 | D1 other course | ## 1 week ago ## |
| teacher1 | forum1 | discussion2 | D2 other course | ## 4 days ago ## |
@javascript
Scenario: All groups can be selected or cleared together in the groups filter, and are unchecked by default
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "forum1"
And I navigate to "Summary report" in current page administration
Then "Groups" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 1 | 1 |
| Student 2 | 0 | 0 |
| Teacher 1 | 2 | 2 |
And I click on "Groups" "button"
And "Group A" "checkbox" should exist in the "filter-groups-popover" "region"
And "Group B" "checkbox" should exist in the "filter-groups-popover" "region"
And "Group C" "checkbox" should exist in the "filter-groups-popover" "region"
And "Group D" "checkbox" should exist in the "filter-groups-popover" "region"
And "No groups" "checkbox" should exist in the "filter-groups-popover" "region"
And "Group E" "checkbox" should not exist in the "filter-groups-popover" "region"
And the following fields match these values:
| Group A | 0 |
| Group B | 0 |
| Group C | 0 |
| Group D | 0 |
| No groups | 0 |
And I click on "Select all" "button" in the "filter-groups-popover" "region"
And the following fields match these values:
| Group A | 1 |
| Group B | 1 |
| Group C | 1 |
| Group D | 1 |
| No groups | 1 |
And I click on "Clear" "button" in the "filter-groups-popover" "region"
And the following fields match these values:
| Group A | 0 |
| Group B | 0 |
| Group C | 0 |
| Group D | 0 |
| No groups | 0 |
And I click on "Select all" "button" in the "filter-groups-popover" "region"
And I click on "Save" "button" in the "filter-groups-popover" "region"
And "Groups (all)" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 1 | 1 |
| Student 2 | 0 | 0 |
| Teacher 1 | 2 | 2 |
@javascript
Scenario: The summary report can be filtered by a subset of groups, and re-ordering the results retains the filter
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "forum1"
And I navigate to "Summary report" in current page administration
Then "Groups" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 1 | 1 |
| Student 2 | 0 | 0 |
| Teacher 1 | 2 | 2 |
And I click on "Groups" "button"
And I click on "Clear" "button" in the "filter-groups-popover" "region"
And I click on "Group A" "checkbox" in the "filter-groups-popover" "region"
And I click on "Group C" "checkbox" in the "filter-groups-popover" "region"
And I click on "Group D" "checkbox" in the "filter-groups-popover" "region"
And I click on "Save" "button"
And "Groups (3)" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 1 | 1 |
| Teacher 1 | 1 | 2 |
And I should not see "Student 2"
# Ensure re-ordering retains filter.
And I click on "Number of discussions posted" "link"
And "Groups (3)" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 1 | 1 |
| Teacher 1 | 1 | 2 |
And I should not see "Student 2"
@javascript
Scenario: The summary report can be filtered as a mixture of groups and no groups
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "forum2"
And I navigate to "Summary report" in current page administration
Then "Groups" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 0 | 0 |
| Student 2 | 1 | 2 |
| Teacher 1 | 3 | 1 |
And I click on "Groups" "button"
And I click on "Clear" "button" in the "filter-groups-popover" "region"
And I click on "Group A" "checkbox" in the "filter-groups-popover" "region"
And I click on "No groups" "checkbox" in the "filter-groups-popover" "region"
And I click on "Save" "button" in the "filter-groups-popover" "region"
And "Groups (2)" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 0 | 0 |
| Student 2 | 1 | 1 |
| Teacher 1 | 2 | 1 |
@javascript
Scenario: The summary report can be filtered by no groups only
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "forum2"
And I navigate to "Summary report" in current page administration
Then the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 0 | 0 |
| Student 2 | 1 | 2 |
| Teacher 1 | 3 | 1 |
And I click on "Groups" "button"
And I click on "Clear" "button" in the "filter-groups-popover" "region"
And I click on "No groups" "checkbox" in the "filter-groups-popover" "region"
And I click on "Save" "button" in the "filter-groups-popover" "region"
And "Groups (1)" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 0 | 0 |
| Student 2 | 1 | 1 |
| Teacher 1 | 1 | 0 |
@javascript
Scenario: Filtering by a group containing no users still allows the page to render
# Log in as admin so Teacher 1 not existing on page can be confirmed.
When I log in as "admin"
And I am on "Course 1" course homepage
And I follow "forum1"
And I navigate to "Summary report" in current page administration
Then "Groups" "button" should exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions | Replies |
| First name / Surname | -3- | -4- |
| Student 1 | 1 | 1 |
| Student 2 | 0 | 0 |
| Teacher 1 | 2 | 2 |
And I click on "Groups" "button"
And I click on "Clear" "button" in the "filter-groups-popover" "region"
And I click on "Group D" "checkbox" in the "filter-groups-popover" "region"
And I click on "Save" "button" in the "filter-groups-popover" "region"
And "Groups (1)" "button" should exist
And I should see "Nothing to display"
And I should not see "Teacher 1"
And I should not see "Student 1"
And I should not see "Student 2"
And I should not see "With selected users..."
And I should not see "Download table data as"
mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
+62
View File
@@ -0,0 +1,62 @@
@mod @mod_forum @forumreport @forumreport_summary
Feature: Groups report filter is not available if no groups exist
When no groups exist
As a teacher
I can view the forum summary report for all users of a forum
Scenario: Report data is available without groups filter if no groups exist
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student1@example.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
| Course 2 | C2 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| teacher1 | C2 | editingteacher |
And the following "groups" exist:
| name | course | idnumber |
| Group A | C2 | G1 |
And the following "group members" exist:
| user | group |
| teacher1 | G1 |
And the following "activities" exist:
| activity | name | description | course | idnumber | groupmode |
| forum | forum1 | C1 first forum | C1 | forum1 | 0 |
| forum | forum2 | C1 second forum | C1 | forum2 | 0 |
| forum | forum1 | C2 first forum | C2 | forum1 | 2 |
And the following forum discussions exist in course "Course 1":
| user | forum | name | message | created |
| teacher1 | forum1 | discussion1 | D1 message | ## 1 month ago ## |
| teacher1 | forum1 | discussion2 | D2 message | ## 1 week ago ## |
| teacher1 | forum2 | discussion3 | D3 message | ## 4 days ago ## |
| student1 | forum1 | discussion4 | D4 message | ## 3 days ago ## |
| student2 | forum2 | discussion5 | D5 message | ## 2 days ago## |
And the following forum replies exist in course "Course 1":
| user | forum | discussion | message | created |
| teacher1 | forum1 | discussion1 | D1 reply | ## 3 weeks ago ## |
| teacher1 | forum1 | discussion2 | D2 reply | ## 6 days ago ## |
| teacher1 | forum2 | discussion3 | D3 reply | ## 3 days ago ## |
| student1 | forum1 | discussion1 | D1 reply 2 | ## 2 weeks ago ## |
| student2 | forum2 | discussion3 | D3 reply | ## 2 days ago ## |
And the following forum discussions exist in course "Course 2":
| user | forum | name | message | created |
| teacher1 | forum1 | discussion1 | D1 other course | ## 1 week ago ## |
| teacher1 | forum1 | discussion2 | D2 other course | ## 4 days ago ## |
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "forum1"
And I navigate to "Summary report" in current page administration
Then "Groups" "button" should not exist
And the following should exist in the "forumreport_summary_table" table:
# | | Discussions |
| First name / Surname | -3- |
| Teacher 1 | 2 |
| Student 1 | 1 |
| Student 2 | 0 |
mod/forum/tests/behat/behat_mod_forum.php
+33
View File
@@ -166,6 +166,12 @@ class behat_mod_forum extends behat_base {
$cm = get_coursemodule_from_instance('forum', $discussioninfo['forum']);
}
// Prepare data for groups if needed.
if (!empty($discussioninfo['group'])) {
$discussioninfo['groupid'] = $this->get_group_id($courseid, $discussioninfo['group']);
unset($discussioninfo['group']);
}
// Create the discussion post.
$discussion = $forumgenerator->create_discussion($discussioninfo);
$postid = $DB->get_field('forum_posts', 'id', ['discussion' => $discussion->id]);
@@ -368,6 +374,33 @@ class behat_mod_forum extends behat_base {
return $forumid;
}
/**
* Fetch Group ID using group name.
*
* @param int $courseid The course ID the forum exists within.
* @param string $groupname The short name of the group.
* @return int The group ID.
* @throws Exception
*/
protected function get_group_id(int $courseid, string $groupname): int {
global $DB;
if ($groupname === 'All participants') {
return -1;
}
$conditions = [
'courseid' => $courseid,
'idnumber' => $groupname,
];
if (!$groupid = $DB->get_field('groups', 'id', $conditions)) {
throw new Exception("A group with name '{$groupname}' does not exist in the provided course");
}
return $groupid;
}
/**
* Fetch discussion ID and first post ID by discussion name.
*