From c617a7271acf0f2f207e49e7cd6edafb80e4cd01 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Mon, 14 Jan 2019 13:31:23 +0800
Subject: [PATCH] MDL-63620 group: Option to enable group messaging for
 imported groups

---
 group/import.php                        |  4 +++-
 group/tests/behat/groups_import.feature | 11 +++++++++++
 group/tests/fixtures/groups_import.csv  | 12 ++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/group/import.php b/group/import.php
index 41f8b2a2bf0..2f563a21c3a 100644
--- a/group/import.php
+++ b/group/import.php
@@ -83,7 +83,9 @@ if ($mform_post->is_cancelled()) {
             "groupidnumber" => 1,
             "description" => 1,
             "enrolmentkey" => 1,
-            "groupingname" => 1);
+            "groupingname" => 1,
+            "enablemessaging" => 1,
+        );
 
     // --- get header (field names) ---
     $header = explode($csv_delimiter, array_shift($rawlines));
diff --git a/group/tests/behat/groups_import.feature b/group/tests/behat/groups_import.feature
index 95019f10907..12ad5011664 100644
--- a/group/tests/behat/groups_import.feature
+++ b/group/tests/behat/groups_import.feature
@@ -31,6 +31,17 @@ Feature: Importing of groups and groupings
     And I should see "group-id-1-duplicate"
     And I should see "group-noid-1"
     And I should see "group-noid-2"
+    # Group messaging should have been enabled for group-id-1.
+    And I set the field "groups" to "group-id-1"
+    And I press "Edit group settings"
+    And I should see "Yes" in the "Group messaging" "select"
+    And I press "Cancel"
+     # Group messaging should not have been enabled for group-id-2.
+    And I set the field "groups" to "group-id-2"
+    And I press "Edit group settings"
+    And I should see "No" in the "Group messaging" "select"
+    And I press "Cancel"
+    # Check groupings
     And I follow "Groupings"
     And I should see "Grouping-1"
     And I should see "Grouping-2"
diff --git a/group/tests/fixtures/groups_import.csv b/group/tests/fixtures/groups_import.csv
index ec5fe44981f..0bf1fb42ed1 100644
--- a/group/tests/fixtures/groups_import.csv
+++ b/group/tests/fixtures/groups_import.csv
@@ -1,6 +1,6 @@
-groupname, description, groupidnumber,groupingname
-group-id-1, group-id-1, group-id-1,Grouping-1
-group-id-2, group-id-2, group-id-2,Grouping-2
-group-id-1-duplicate, Duplicate of group-id-1, group-id-1,Grouping-3
-group-noid-1, group-noid-1,,Grouping-3
-group-noid-2, group-noid-2,,Grouping-2
+groupname, description, groupidnumber,groupingname,enablemessaging
+group-id-1, group-id-1, group-id-1,Grouping-1,1
+group-id-2, group-id-2, group-id-2,Grouping-2,0
+group-id-1-duplicate, Duplicate of group-id-1, group-id-1,Grouping-3,0
+group-noid-1, group-noid-1,,Grouping-3,0
+group-noid-2, group-noid-2,,Grouping-2,0