Merge "Bug 1687346: Behat tests for Merging of group messages and notifications feature files"

test/behat/features/group/group_feedback_comment_visible.feature

 @javascript @core @core_artefact @core_group
 Feature: Commenting on a group page
-In order to be able to verify I commented publically on a group page
-As a user
-So leave a comment and it appears in the right place
+    In order to be able to verify I commented publically on a group page
+    As a user
+    So leave a comment and it appears in the right place
 
 Background:
 Given the following "users" exist:
@@ -14,7 +14,9 @@ Given the following "groups" exist:
      | name | owner | description | grouptype | open | invitefriends | editroles | submittableto | allowarchives | members | staff |
      | group 01 | userA | This is group 01 | standard | ON | ON | all | OFF | OFF | userB |   |
 
-
+Given the following "pages" exist:
+      | title | description| ownertype | ownername |
+      | Testing group page 01 | This is the page 01 of the group 01 | group | group 01 |
 
 Scenario: As a user leaving a public comment on a group page (Bug 1509129)
     Given I log in as "userA" with password "Kupuhipa1"
@@ -48,3 +50,26 @@ Scenario: As a user leaving a public comment on a group page (Bug 1509129)
     Then I should see "Group Page 01" in the "h3.panel-heading" "css_element"
     And I click the panel "Group Page 01"
     Then I should see "Adding a comment to this field. Student = Awesome!" in the "div.comment-text" "css_element"
+
+# As part of consolidating behat tests, this scenario has been added.
+# Original feature title: Sending notification message when someone leaves a comment in a group page
+Scenario: Adding a comment on a group page (Bug 1426983) and verifying the notification message.
+    Given I log in as "userA" with password "Kupuhipa1"
+    And I choose "Groups" from main menu
+    And I follow "group 01"
+    And I follow "Pages and collections (tab)"
+    # And I click on "Pages"
+    And I follow "Testing group page 01"
+    And I fill in "Testing comment notifications" in editor "Comment"
+    And I press "Comment"
+    # Log out as user 1
+    And I log out
+    # Log in as  admin
+    When I log in as "userB" with password "Kupuhipa1"
+    # Checking notification display on the dashboard
+    And I wait "1" seconds
+    Then I should see "New comment on Testing group page 01"
+    # Checking notifications also appear in my inbox
+    And I choose "mail" from user menu by id
+    And I follow "New comment on Testing group page 01"
+    And I should see "Testing comment notifications"

test/behat/features/group/notifications_for_group_members.feature

-@javascript @core @core_group
-Feature: Sending notification message when someone leaves a comment in a group page
-    In order to notify a user of a comment on a group page
-    As a user I add a comment
-    So another person can log in and see a notification message
-
-
-Background:
-    Given the following "users" exist:
-     | username  | password  | email | firstname | lastname  | institution   | authname  |role   |
-     | bob   | Kupuhipa1   | bob@example.com   | Bob   | Bobby | mahara    | internal  | member    |
-     | jen   | mahara1   | jen@example.com   | Jen   | Jenny | mahara | internal  | member    |
-
-    Given the following "groups" exist:
-     | name | owner | description | grouptype | open | invitefriends | editroles | submittableto | allowarchives | members | staff |
-     | Test group 1 | admin | This is group 01 | standard | ON | ON | all | ON | ON | bob , jen  | jen |
-
-
-    Given the following "pages" exist:
-     | title | description| ownertype | ownername |
-     | Testing group page 01 | This is the page 01 of the group 01 | group | Test group 1 |
-
-
-
-Scenario: Adding a comment on a group page (Bug 1426983)
-    Given I log in as "bob" with password "Kupuhipa1"
-    And I choose "Groups" from main menu
-    And I follow "Test group 1"
-    And I follow "Pages and collections (tab)"
-    # And I click on "Pages"
-    And I follow "Testing group page 01"
-    And I fill in "Testing comment notifications" in editor "Comment"
-    And I press "Comment"
-    # Log out as user 1
-    And I log out
-    # Log in as "Admin" user
-    When I log in as "admin" with password "Kupuhipa1"
-    # Checking notification display on the dashboard
-    Then I should see "New comment on Testing group page 01"
-    # Checking notifications also appear in my inbox
-    And I choose "mail" from user menu by id
-    And I follow "New comment on Testing group page 01"
-    And I should see "Testing comment notifications"