Merge branch 'MDL-65657-int-fix-1' of https://github.com/ryanwyllie/m…

…oodle
moodle · May 28, 2019 · 4f8e821 · 4f8e821
2 parents 83cdcd9 + 95a445b
commit 4f8e821
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 7 deletions.
diff --git a/message/tests/behat/delete_messages.feature b/message/tests/behat/delete_messages.feature
@@ -34,7 +34,8 @@ Feature: Delete messages from conversations
       | student2 | student1 | Hello!        |
       | student1 | student2 | Are you free? |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Delete a message sent by the user from a group conversation
     Given I log in as "student1"

diff --git a/message/tests/behat/favourite_conversations.feature b/message/tests/behat/favourite_conversations.feature
@@ -24,7 +24,8 @@ Feature: Star and unstar conversations
       | student1 | G1 |
       | student2 | G1 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Star a group conversation
     Given I log in as "student1"

diff --git a/message/tests/behat/group_conversation.feature b/message/tests/behat/group_conversation.feature
@@ -39,6 +39,9 @@ Feature: Create conversations for course's groups
       | teacher1 | G2 |
       | teacher1 | G3 |
       | student0 | G3 |
+    And the following config values are set as admin:
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Group conversations are restricted to members
     Given I log in as "teacher1"

diff --git a/message/tests/behat/message_delete_conversation.feature b/message/tests/behat/message_delete_conversation.feature
@@ -19,6 +19,7 @@ Feature: Message delete conversations
     And the following config values are set as admin:
       | messaging         | 1 |
       | messagingallusers | 1 |
+      | messagingminpoll  | 1 |
     And the following "private messages" exist:
       | user     | contact  | message               |
       | student1 | student2 | Hi!                   |

diff --git a/message/tests/behat/message_drawer_manage_contacts.feature b/message/tests/behat/message_drawer_manage_contacts.feature
@@ -24,8 +24,9 @@ Feature: Manage contacts
       | user     | contact |
       | student1 | student2 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging         | 1 |
       | messagingallusers | 1 |
+      | messagingminpoll  | 1 |
 
   Scenario: Send a 'contact request' to someone to add a contact
     Given I log in as "student1"

diff --git a/message/tests/behat/message_manage_preferences.feature b/message/tests/behat/message_manage_preferences.feature
@@ -33,8 +33,9 @@ Feature: Manage preferences
       | user     | contact |
       | student1 | student2 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging         | 1 |
       | messagingallusers | 1 |
+      | messagingminpoll  | 1 |
 
   # Recipient has 'My contacts only' set.
   Scenario: Allow sending a message when you are a contact

diff --git a/message/tests/behat/message_send_messages.feature b/message/tests/behat/message_send_messages.feature
@@ -24,7 +24,8 @@ Feature: Message send messages
       | student1 | G1 |
       | student2 | G1 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Send a message to a group conversation
     Given I log in as "student1"

diff --git a/message/tests/behat/self_conversation.feature b/message/tests/behat/self_conversation.feature
@@ -9,7 +9,8 @@ Feature: Self conversation
       | username | firstname | lastname | email                |
       | student1 | Student   | 1        | student1@example.com |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Self conversation exists
     Given I log in as "student1"

diff --git a/message/tests/behat/unread_messages.feature b/message/tests/behat/unread_messages.feature
@@ -24,7 +24,8 @@ Feature: Unread messages
       | student1 | NG |
       | student2 | NG |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Unread messages for group conversation
     Given I log in as "student1"