diff --git a/tests/acceptance/features/apiNotification/spaceNotification.feature b/tests/acceptance/features/apiNotification/spaceNotification.feature index df26aa47239..b1614c37650 100644 --- a/tests/acceptance/features/apiNotification/spaceNotification.feature +++ b/tests/acceptance/features/apiNotification/spaceNotification.feature @@ -276,7 +276,7 @@ Feature: Notification """ @issue-10882 @email - Scenario: user gets an email notification when space membership expires + Scenario: user gets in-app and email notifications when space membership expires Given the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API And user "Alice" has created a space "new-space" with the default quota using the Graph API And user "Alice" has sent the following space share invitation: @@ -286,65 +286,14 @@ Feature: Notification | permissionsRole | Space Viewer | When user "Alice" has expired the membership of user "Brian" from space "new-space" Then the HTTP status code should be "200" - # And user "Brian" should have received the following email from user "Alice" about the share of project space "new-space" - # """ - # Hello Brian Murphy, - - # Your membership of space new-space has expired at %expiry_date_in_mail% - - # Even though this membership has expired you still might have access through other shares and/or space memberships - # """ - And the JSON response should contain a notification message with the subject "Neue Freigabe" and the message-details should match + And user "Brian" should get a notification with subject "Membership expired" and message: + | message | + | Access to Space new-space lost | + And user "Brian" should have received the following email from user "Alice" about the share of project space "new-space" """ - { - "type": "object", - "required": [ - "app", - "datetime", - "message", - "messageRich", - "messageRichParameters", - "notification_id", - "object_id", - "object_type", - "subject", - "subjectRich", - "user" - ], - "properties": { - "app": {"const": "userlog"}, - "message": {"const": "Alice Hansen shared with you"}, - "messageRich": {"const": "{user} shared {resource} with you"}, - "messageRichParameters": { - "type": "object", - "required": ["resource","user"], - "properties": { - "resource": { - "type": "object", - "required": ["id","name"], - "properties": { - "id": {"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\$[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}![a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"}, - "name": {"const": ""} - } - }, - "user": { - "type": "object", - "required": ["displayname","id","name"], - "properties": { - "displayname": {"const": "Alice Hansen"}, - "id": {"pattern": "^%user_id_pattern%$"}, - "name": {"const": "Alice"} - } - } - } - }, - "notification_id": {"type": "string"}, - "object_id": {"type": "string"}, - "object_type": {"const": "share"}, - "subject": {"const": "Resource shared"}, - "subjectRich": {"const": "Resource shared"}, - "user": {"const": "Alice"} - } - } + Hello Brian Murphy, + + Your membership of space new-space has expired at %expiry_date_in_mail% + + Even though this membership has expired you still might have access through other shares and/or space memberships """ - \ No newline at end of file