From 350cb520b865111a892c645c757f89fa1380bd4d Mon Sep 17 00:00:00 2001 From: Ryan Wyllie Date: Tue, 28 May 2019 09:59:14 +0800 Subject: [PATCH] MDL-65657 message: reduce message poll timer for behat tests --- message/tests/behat/delete_messages.feature | 3 ++- message/tests/behat/favourite_conversations.feature | 3 ++- message/tests/behat/group_conversation.feature | 3 +++ message/tests/behat/message_delete_conversation.feature | 1 + message/tests/behat/message_drawer_manage_contacts.feature | 3 ++- message/tests/behat/message_manage_preferences.feature | 3 ++- message/tests/behat/message_send_messages.feature | 3 ++- message/tests/behat/unread_messages.feature | 3 ++- 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/message/tests/behat/delete_messages.feature b/message/tests/behat/delete_messages.feature index 3f985ebce04..9de5bc3f0d6 100644 --- 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 index 3babfe4b673..86689b66902 100644 --- 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 index c6fce937555..c8b0ff01333 100644 --- 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 index 8d7abe4f5b4..30dd8df8abd 100644 --- 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 index 4c57223ac82..1b8c3b01f00 100644 --- 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 index a9a85658fdc..b304c80e4b4 100644 --- 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 index 4a566b38981..3b93a6da108 100644 --- 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/unread_messages.feature b/message/tests/behat/unread_messages.feature index d1ddec091b9..c1e8a942d1f 100644 --- 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"