From 7ba5567205e77a974694afd02a71381fcccb2c07 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 6 Nov 2015 18:30:12 +0000 Subject: [PATCH 1/2] MDL-50426 behat: fix compatibility with 29 The test was not working on this branch due to missing MDL-27177 --- message/tests/behat/block_noncontacts.feature | 5 ++++- message/tests/behat/block_users.feature | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/message/tests/behat/block_noncontacts.feature b/message/tests/behat/block_noncontacts.feature index 1c90daa5bc2..e19ffe14252 100644 --- a/message/tests/behat/block_noncontacts.feature +++ b/message/tests/behat/block_noncontacts.feature @@ -40,6 +40,9 @@ Feature: Block users from contacting me And I press "Search people and messages" When I follow "Send message to User One" Then I should see "User One only accepts messages from their contacts." - And I follow "Picture of User One" + And I am on site homepage + And I follow "Course 1" + And I follow "Participants" + And I follow "User One" And I press "Message" And I should see "User One only accepts messages from their contacts." diff --git a/message/tests/behat/block_users.feature b/message/tests/behat/block_users.feature index 3d039135bfa..777599bce53 100644 --- a/message/tests/behat/block_users.feature +++ b/message/tests/behat/block_users.feature @@ -39,6 +39,9 @@ Feature: Block users from contacting me And I press "Search people and messages" When I follow "Send message to User One" Then I should see "This user has blocked you from sending messages to them" - And I follow "Picture of User One" + And I am on site homepage + And I follow "Course 1" + And I follow "Participants" + And I follow "User One" And I press "Message" And I should see "This user has blocked you from sending messages to them" From c2cc463678868b080be9ad6fddd4abab177d6215 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 6 Nov 2015 18:35:43 +0000 Subject: [PATCH 2/2] MDL-50426 behat: Update non-contacts feature naming --- message/tests/behat/block_noncontacts.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/message/tests/behat/block_noncontacts.feature b/message/tests/behat/block_noncontacts.feature index e19ffe14252..99fb48f3822 100644 --- a/message/tests/behat/block_noncontacts.feature +++ b/message/tests/behat/block_noncontacts.feature @@ -1,8 +1,8 @@ @core @core_message -Feature: Block users from contacting me - In order to block other users +Feature: Block non contacts from contacting me + In order to reduce unsolicited messages As a user - I need to prevent specific users to sending me messages + I need to prevent non-contacts from sending me messages Background: Given the following "users" exist: