-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Persist ReadNotifications in databundle * Add remove or replace sql databundle methods into base test case * Remove unnecessary checking of account migrated * Migrate StudentNotificationPageE2ETest * Fix lint issues * Return sqldatabundle for tests * Revert changes to NotificationPage to use notification id instead * Add assertion for readNotifications from account * fix architectureTest --------- Co-authored-by: Wei Qing <[email protected]>
- Loading branch information
1 parent
df49335
commit affcc46
Showing
18 changed files
with
280 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,4 @@ | ||
| { | ||
| "accounts": { | ||
| "SNotifs.student": { | ||
| "googleId": "tm.e2e.SNotifs.student", | ||
| "name": "Alice B", | ||
| "email": "[email protected]", | ||
| "readNotifications": { | ||
| "notification4": "2099-04-04T00:00:00Z" | ||
| } | ||
| } | ||
| }, | ||
| "courses": { | ||
| "typicalCourse1": { | ||
| "id": "tm.e2e.SNotifs.course1", | ||
|
|
@@ -27,62 +17,5 @@ | |
| "team": "Team 1</td></div>'\"", | ||
| "section": "None" | ||
| } | ||
| }, | ||
| "notifications": { | ||
| "notification1": { | ||
| "notificationId": "notification1", | ||
| "startTime": "2011-01-01T00:00:00Z", | ||
| "endTime": "2099-01-01T00:00:00Z", | ||
| "createdAt": "2011-01-01T00:00:00Z", | ||
| "style": "DANGER", | ||
| "targetUser": "GENERAL", | ||
| "title": "E2E notif for general users", | ||
| "message": "<p>This notification is shown to general users</p>", | ||
| "shown": false | ||
| }, | ||
| "notification2": { | ||
| "notificationId": "notification2", | ||
| "startTime": "2011-02-02T00:00:00Z", | ||
| "endTime": "2099-02-02T00:00:00Z", | ||
| "createdAt": "2011-01-01T00:00:00Z", | ||
| "style": "SUCCESS", | ||
| "targetUser": "STUDENT", | ||
| "title": "E2E notif for students", | ||
| "message": "<p>This notification is shown to students only</p>", | ||
| "shown": false | ||
| }, | ||
| "notification3": { | ||
| "notificationId": "notification3", | ||
| "startTime": "2011-03-03T00:00:00Z", | ||
| "endTime": "2099-03-03T00:00:00Z", | ||
| "createdAt": "2011-01-01T00:00:00Z", | ||
| "style": "SUCCESS", | ||
| "targetUser": "INSTRUCTOR", | ||
| "title": "E2E notif for instructors", | ||
| "message": "<p>This notification is shown to instructors only</p>", | ||
| "shown": false | ||
| }, | ||
| "notification4": { | ||
| "notificationId": "notification4", | ||
| "startTime": "2011-04-04T00:00:00Z", | ||
| "endTime": "2099-04-04T00:00:00Z", | ||
| "createdAt": "2011-01-01T00:00:00Z", | ||
| "style": "WARNING", | ||
| "targetUser": "GENERAL", | ||
| "title": "E2E read notification", | ||
| "message": "<p>This notification has been read by the user</p>", | ||
| "shown": false | ||
| }, | ||
| "expiredNotification1": { | ||
| "notificationId": "expiredNotification1", | ||
| "startTime": "2011-01-01T00:00:00Z", | ||
| "endTime": "2011-02-02T00:00:00Z", | ||
| "createdAt": "2011-01-01T00:00:00Z", | ||
| "style": "DANGER", | ||
| "targetUser": "GENERAL", | ||
| "title": "E2E expired notification", | ||
| "message": "<p>This notification has expired</p>", | ||
| "shown": false | ||
| } | ||
| } | ||
| } | ||
73 changes: 73 additions & 0 deletions
73
src/e2e/resources/data/StudentNotificationsPageE2ETest_SqlEntities.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| "accounts": { | ||
| "SNotifs.student": { | ||
| "id": "00000000-0000-4000-8000-000000000001", | ||
| "googleId": "tm.e2e.SNotifs.student", | ||
| "name": "Alice B", | ||
| "email": "[email protected]" | ||
| } | ||
| }, | ||
| "notifications": { | ||
| "notification1": { | ||
| "id": "00000000-0000-4000-8000-000000001101", | ||
| "startTime": "2011-01-01T00:00:00Z", | ||
| "endTime": "2099-01-01T00:00:00Z", | ||
| "style": "DANGER", | ||
| "targetUser": "GENERAL", | ||
| "title": "SNotifs.notification1", | ||
| "message": "<p>This notification is shown to general users</p>", | ||
| "shown": false | ||
| }, | ||
| "notification2": { | ||
| "id": "00000000-0000-4000-8000-000000001102", | ||
| "startTime": "2011-02-02T00:00:00Z", | ||
| "endTime": "2099-02-02T00:00:00Z", | ||
| "style": "SUCCESS", | ||
| "targetUser": "STUDENT", | ||
| "title": "SNotifs.notification2", | ||
| "message": "<p>This notification is shown to students only</p>", | ||
| "shown": false | ||
| }, | ||
| "notification3": { | ||
| "id": "00000000-0000-4000-8000-000000001103", | ||
| "startTime": "2011-03-03T00:00:00Z", | ||
| "endTime": "2099-03-03T00:00:00Z", | ||
| "style": "SUCCESS", | ||
| "targetUser": "INSTRUCTOR", | ||
| "title": "SNotifs.notification3", | ||
| "message": "<p>This notification is shown to instructors only</p>", | ||
| "shown": false | ||
| }, | ||
| "notification4": { | ||
| "id": "00000000-0000-4000-8000-000000001104", | ||
| "startTime": "2011-04-04T00:00:00Z", | ||
| "endTime": "2099-04-04T00:00:00Z", | ||
| "style": "WARNING", | ||
| "targetUser": "GENERAL", | ||
| "title": "SNotifs.notification4", | ||
| "message": "<p>This notification has been read by the user</p>", | ||
| "shown": false | ||
| }, | ||
| "expiredNotification1": { | ||
| "id": "00000000-0000-4000-8000-000000001105", | ||
| "startTime": "2011-01-01T00:00:00Z", | ||
| "endTime": "2011-02-02T00:00:00Z", | ||
| "style": "DANGER", | ||
| "targetUser": "GENERAL", | ||
| "title": "SNotifs.expiredNotification1", | ||
| "message": "<p>This notification has expired</p>", | ||
| "shown": false | ||
| } | ||
| }, | ||
| "readNotifications": { | ||
| "notification4SNotifs.student": { | ||
| "id": "00000000-0000-4000-8000-000000002100", | ||
| "account": { | ||
| "id": "00000000-0000-4000-8000-000000000001" | ||
| }, | ||
| "notification": { | ||
| "id": "00000000-0000-4000-8000-000000001104" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.