From 3187a20409f1c6fcaa93d8da26dcfb298d629345 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Fri, 26 Jan 2024 15:24:46 -0500 Subject: [PATCH 01/25] Instructor extending individual deadlines: table doesn't sort by team issue fixed --- .../instructor-session-individual-extension-page.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-session-individual-extension-page/instructor-session-individual-extension-page.component.ts b/src/web/app/pages-instructor/instructor-session-individual-extension-page/instructor-session-individual-extension-page.component.ts index fe83cc5d2ae..f6fd5848709 100644 --- a/src/web/app/pages-instructor/instructor-session-individual-extension-page/instructor-session-individual-extension-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-individual-extension-page/instructor-session-individual-extension-page.component.ts @@ -531,8 +531,8 @@ export class InstructorSessionIndividualExtensionPageComponent implements OnInit strB = b.sectionName; break; case SortBy.TEAM_NAME: - strA = a.sectionName; - strB = b.sectionName; + strA = a.teamName; + strB = b.teamName; break; case SortBy.RESPONDENT_NAME: strA = a.name; From 1e7e6a2c2c5709bb856b38ba29afb75bb5c5c92c Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Sun, 28 Jan 2024 22:11:40 -0500 Subject: [PATCH 02/25] ETETest case build failure issue fix --- .../InstructorSessionIndividualExtensionPageE2ETest.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 0637ef464c6..d817da29731 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -138,8 +138,13 @@ "isOpeningEmailEnabled": true, "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, - "studentDeadlines": {}, - "instructorDeadlines": {} + "studentDeadlines": { + "alice.tmms@gmail.tmt": "", + "charlie.tmms@gmail.tmt": "" + }, + "instructorDeadlines": { + "instructor1.tmms@gmail.tmt": "" + } } }, "feedbackQuestions": { From 646f1d690dee8801fb43474337462b2c92b89dc8 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Sun, 28 Jan 2024 22:24:08 -0500 Subject: [PATCH 03/25] ETETest case build failure issue fix --- .../InstructorSessionIndividualExtensionPageE2ETest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index d817da29731..7bc5ff636c8 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -139,11 +139,11 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { - "alice.tmms@gmail.tmt": "", - "charlie.tmms@gmail.tmt": "" + "alice.tmms@gmail.tmt": "2032-04-30T16:00:00Z", + "charlie.tmms@gmail.tmt": "2032-04-30T16:00:00Z" }, "instructorDeadlines": { - "instructor1.tmms@gmail.tmt": "" + "instructor1.tmms@gmail.tmt": "2032-04-30T16:00:00Z" } } }, From b883dc016795f140b8956df132ba3a760a008bcd Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Sun, 28 Jan 2024 22:42:08 -0500 Subject: [PATCH 04/25] ETETest case build failure issue fix --- .../data/InstructorSessionIndividualExtensionPageE2ETest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 7bc5ff636c8..8d8f7d47c32 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -139,7 +139,7 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { - "alice.tmms@gmail.tmt": "2032-04-30T16:00:00Z", + "alice.tmms@gmail.tmt": "2032-04-30T16:00:00Z", "charlie.tmms@gmail.tmt": "2032-04-30T16:00:00Z" }, "instructorDeadlines": { @@ -220,4 +220,4 @@ } }, "feedbackResponseComments": {} -} +} \ No newline at end of file From 1ac968afa33f8d4c2a29d408cd899f6f4365c790 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Sun, 28 Jan 2024 23:47:28 -0500 Subject: [PATCH 05/25] Update InstructorSessionIndividualExtensionPageE2ETest.json lint format fix --- .../data/InstructorSessionIndividualExtensionPageE2ETest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 8d8f7d47c32..86b6c65e48e 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -220,4 +220,4 @@ } }, "feedbackResponseComments": {} -} \ No newline at end of file +} From 77cd4c9898711c01e907f3fe5706225637861c73 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 06:45:00 -0500 Subject: [PATCH 06/25] Update InstructorSessionIndividualExtensionPageE2ETest.java test failure fix --- .../cases/InstructorSessionIndividualExtensionPageE2ETest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java index 69b33360248..d193dc1dd20 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java @@ -32,6 +32,8 @@ public class InstructorSessionIndividualExtensionPageE2ETest extends BaseE2ETest protected void prepareTestData() { testData = loadDataBundle("/InstructorSessionIndividualExtensionPageE2ETest.json"); testEmail = TestProperties.TEST_EMAIL; + removeAndRestoreDataBundle(testData); + testData.students.get("alice.tmms@ISesIe.CS2104").setEmail(testEmail); instructor = testData.instructors.get("ISesIe.instructor1"); course = testData.courses.get("course"); @@ -39,7 +41,6 @@ protected void prepareTestData() { students = testData.students.values(); instructors = testData.instructors.values(); - removeAndRestoreDataBundle(testData); } @Test From 74ba497d0b490eebee79da80431a1febc35ced27 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 07:34:18 -0500 Subject: [PATCH 07/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test case failure fix --- ...tructorSessionIndividualExtensionPageE2ETest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 86b6c65e48e..f44dbcad052 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -139,11 +139,11 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { - "alice.tmms@gmail.tmt": "2032-04-30T16:00:00Z", - "charlie.tmms@gmail.tmt": "2032-04-30T16:00:00Z" + "alice.tmms@gmail.tmt": "2032-04-30T17:00:00Z", + "charlie.tmms@gmail.tmt": "2032-04-30T17:00:00Z" }, "instructorDeadlines": { - "instructor1.tmms@gmail.tmt": "2032-04-30T16:00:00Z" + "instructor1.tmms@gmail.tmt": "2032-04-30T17:00:00Z" } } }, @@ -181,7 +181,7 @@ }, "qn2": { "feedbackSessionName": "First Session", - "courseId": "tm.e2e.FRes.CS2104", + "courseId": "tm.e2e.ISesIe.CS2104", "questionDetails": { "questionType": "TEXT", "questionText": "First instructor question" @@ -209,8 +209,8 @@ "feedbackSessionName": "First Session", "courseId": "tm.e2e.ISesIe.CS2104", "feedbackQuestionId": "1", - "giver": "ISesIe.danny.tmms@gmail.tmt", - "recipient": "ISesIe.danny.tmms@gmail.tmt", + "giver": "danny.tmms@gmail.tmt", + "recipient": "danny.tmms@gmail.tmt", "giverSection": "None", "recipientSection": "None", "responseDetails": { From 2f59cbc6d4c6009695aa0c953c7f464d3d4a822f Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 07:50:48 -0500 Subject: [PATCH 08/25] Revert "Update InstructorSessionIndividualExtensionPageE2ETest.java" This reverts commit 77cd4c9898711c01e907f3fe5706225637861c73. --- .../cases/InstructorSessionIndividualExtensionPageE2ETest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java index d193dc1dd20..69b33360248 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java @@ -32,8 +32,6 @@ public class InstructorSessionIndividualExtensionPageE2ETest extends BaseE2ETest protected void prepareTestData() { testData = loadDataBundle("/InstructorSessionIndividualExtensionPageE2ETest.json"); testEmail = TestProperties.TEST_EMAIL; - removeAndRestoreDataBundle(testData); - testData.students.get("alice.tmms@ISesIe.CS2104").setEmail(testEmail); instructor = testData.instructors.get("ISesIe.instructor1"); course = testData.courses.get("course"); @@ -41,6 +39,7 @@ protected void prepareTestData() { students = testData.students.values(); instructors = testData.instructors.values(); + removeAndRestoreDataBundle(testData); } @Test From 3d1b3e429ba7d387fb40cb6fab217283fb5c87aa Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 08:22:25 -0500 Subject: [PATCH 09/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test case fix --- .../data/InstructorSessionIndividualExtensionPageE2ETest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index f44dbcad052..806083bb39f 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -139,7 +139,6 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { - "alice.tmms@gmail.tmt": "2032-04-30T17:00:00Z", "charlie.tmms@gmail.tmt": "2032-04-30T17:00:00Z" }, "instructorDeadlines": { From 1ce977f8821a5d9243762c10896296e2eb2a5d73 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 09:28:37 -0500 Subject: [PATCH 10/25] Update InstructorSessionIndividualExtensionPageE2ETest.java test case fix --- .../cases/InstructorSessionIndividualExtensionPageE2ETest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java index 69b33360248..eca33c82395 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java @@ -33,7 +33,7 @@ protected void prepareTestData() { testData = loadDataBundle("/InstructorSessionIndividualExtensionPageE2ETest.json"); testEmail = TestProperties.TEST_EMAIL; testData.students.get("alice.tmms@ISesIe.CS2104").setEmail(testEmail); - instructor = testData.instructors.get("ISesIe.instructor1"); + instructor = testData.instructors.get("instructor"); course = testData.courses.get("course"); feedbackSession = testData.feedbackSessions.get("firstSession"); students = testData.students.values(); From 78a3ba4345486f6bdc361b2c804bd0c3c63f8eb3 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 10:01:23 -0500 Subject: [PATCH 11/25] Revert "Update InstructorSessionIndividualExtensionPageE2ETest.java" This reverts commit 1ce977f8821a5d9243762c10896296e2eb2a5d73. --- .../cases/InstructorSessionIndividualExtensionPageE2ETest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java index eca33c82395..69b33360248 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java @@ -33,7 +33,7 @@ protected void prepareTestData() { testData = loadDataBundle("/InstructorSessionIndividualExtensionPageE2ETest.json"); testEmail = TestProperties.TEST_EMAIL; testData.students.get("alice.tmms@ISesIe.CS2104").setEmail(testEmail); - instructor = testData.instructors.get("instructor"); + instructor = testData.instructors.get("ISesIe.instructor1"); course = testData.courses.get("course"); feedbackSession = testData.feedbackSessions.get("firstSession"); students = testData.students.values(); From 45be88257be1c940e73a97cdfac5118952b2ce0b Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 11:04:50 -0500 Subject: [PATCH 12/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test case failure fix --- .../InstructorSessionIndividualExtensionPageE2ETest.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 806083bb39f..cdae21bdd10 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -21,6 +21,12 @@ "name": "Programming Language Concepts", "institute": "TEAMMATES Test Institute 1", "timeZone": "Asia/Singapore" + }, + "course2": { + "id": "tm.e2e.ISesIe.CS2105", + "name": "Programming Language Concepts", + "institute": "TEAMMATES Test Institute 1", + "timeZone": "Asia/Singapore" } }, "instructors": { From c5fe20bef563c16eaf3be0ee62d24e93f4b909f4 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 11:44:51 -0500 Subject: [PATCH 13/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test case failure fix --- ...SessionIndividualExtensionPageE2ETest.json | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index cdae21bdd10..b86a2ab0c66 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -150,6 +150,32 @@ "instructorDeadlines": { "instructor1.tmms@gmail.tmt": "2032-04-30T17:00:00Z" } + }, + "openSession": { + "feedbackSessionName": "Open Session", + "courseId": "tm.e2e.ISesIe.CS2104", + "creatorEmail": "instructor1.tmms@gmail.tmt", + "instructions": "

Instructions for Open Session

", + "createdTime": "2012-04-01T23:59:00Z", + "startTime": "2012-04-01T22:00:00Z", + "endTime": "2032-04-30T16:00:00Z", + "sessionVisibleFromTime": "2012-04-01T22:00:00Z", + "resultsVisibleFromTime": "2032-05-01T22:00:00Z", + "timeZone": "Asia/Singapore", + "gracePeriod": 10, + "sentOpenEmail": false, + "sentClosingEmail": false, + "sentClosedEmail": false, + "sentPublishedEmail": false, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "studentDeadlines": { + "charlie.tmms@gmail.tmt": "2032-04-30T17:00:00Z" + }, + "instructorDeadlines": { + "instructor1.tmms@gmail.tmt": "2032-04-30T17:00:00Z" + } } }, "feedbackQuestions": { From 28c33642d1da4a04a94b457b60b561f464623afb Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 12:26:13 -0500 Subject: [PATCH 14/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test case failure fix --- ...SessionIndividualExtensionPageE2ETest.json | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index b86a2ab0c66..46ca331da5b 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -250,5 +250,29 @@ } } }, - "feedbackResponseComments": {} + "feedbackResponseComments": {}, + "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": "

This notification is shown to general users

", + "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": "

This notification is shown to students only

", + "shown": false + } + } } From fe80153238d12bf1987e20f1d9d3b032e276f2e7 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 15:46:23 -0500 Subject: [PATCH 15/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test fix --- .../data/InstructorSessionIndividualExtensionPageE2ETest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 46ca331da5b..9054bffb89a 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -145,6 +145,7 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { + "alice.tmms@gmail.tmt": "2032-04-30T17:00:00Z", "charlie.tmms@gmail.tmt": "2032-04-30T17:00:00Z" }, "instructorDeadlines": { From 63cf4d27ddb5f4aca0bc696ced261a8f1d2e2505 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 16:25:48 -0500 Subject: [PATCH 16/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test fix --- .../InstructorSessionIndividualExtensionPageE2ETest.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 9054bffb89a..e7c857e0717 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -145,7 +145,6 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { - "alice.tmms@gmail.tmt": "2032-04-30T17:00:00Z", "charlie.tmms@gmail.tmt": "2032-04-30T17:00:00Z" }, "instructorDeadlines": { @@ -214,10 +213,7 @@ "qn2": { "feedbackSessionName": "First Session", "courseId": "tm.e2e.ISesIe.CS2104", - "questionDetails": { - "questionType": "TEXT", - "questionText": "First instructor question" - }, + "questionDetails": {}, "questionNumber": 2, "giverType": "INSTRUCTORS", "recipientType": "STUDENTS", From 0b3383e60b4a1442ac0ac368676c1ce4fc7366d8 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 16:57:00 -0500 Subject: [PATCH 17/25] Update InstructorSessionIndividualExtensionPageE2ETest.json reverted --- .../InstructorSessionIndividualExtensionPageE2ETest.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index e7c857e0717..46ca331da5b 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -213,7 +213,10 @@ "qn2": { "feedbackSessionName": "First Session", "courseId": "tm.e2e.ISesIe.CS2104", - "questionDetails": {}, + "questionDetails": { + "questionType": "TEXT", + "questionText": "First instructor question" + }, "questionNumber": 2, "giverType": "INSTRUCTORS", "recipientType": "STUDENTS", From bad806bba4809bf91e1d417d20ebb0eba3f9f244 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 20:20:16 -0500 Subject: [PATCH 18/25] Update InstructorSessionIndividualExtensionPageE2ETest.java test fix --- .../InstructorSessionIndividualExtensionPageE2ETest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java index 69b33360248..04c06e0f2af 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java @@ -32,14 +32,12 @@ public class InstructorSessionIndividualExtensionPageE2ETest extends BaseE2ETest protected void prepareTestData() { testData = loadDataBundle("/InstructorSessionIndividualExtensionPageE2ETest.json"); testEmail = TestProperties.TEST_EMAIL; - testData.students.get("alice.tmms@ISesIe.CS2104").setEmail(testEmail); + removeAndRestoreDataBundle(testData); instructor = testData.instructors.get("ISesIe.instructor1"); course = testData.courses.get("course"); feedbackSession = testData.feedbackSessions.get("firstSession"); students = testData.students.values(); instructors = testData.instructors.values(); - - removeAndRestoreDataBundle(testData); } @Test From 8f0c64d8952de9de6aea9595b015db9a93a50b1d Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 20:47:51 -0500 Subject: [PATCH 19/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test fix --- .../data/InstructorSessionIndividualExtensionPageE2ETest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 46ca331da5b..9054bffb89a 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -145,6 +145,7 @@ "isClosingEmailEnabled": true, "isPublishedEmailEnabled": true, "studentDeadlines": { + "alice.tmms@gmail.tmt": "2032-04-30T17:00:00Z", "charlie.tmms@gmail.tmt": "2032-04-30T17:00:00Z" }, "instructorDeadlines": { From 2958f18db48767077b99535c61da7e6a0bbb8246 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 21:23:38 -0500 Subject: [PATCH 20/25] Update InstructorSessionIndividualExtensionPageE2ETest.java test fix --- .../InstructorSessionIndividualExtensionPageE2ETest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java index 04c06e0f2af..47b5f87cee1 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorSessionIndividualExtensionPageE2ETest.java @@ -53,7 +53,7 @@ public void testAll() { ______TS("verify extend some deadlines, notifyUsers enabled"); - individualExtensionPage.selectStudents(0, 2); // alice and charlie + individualExtensionPage.selectStudents(0, 1); // alice and charlie individualExtensionPage.selectInstructor(0); // instructor 1 individualExtensionPage.extendDeadlineByTwelveHours(true); @@ -64,7 +64,7 @@ public void testAll() { Map updatedInstructorDeadlines = updatedSession.getInstructorDeadlines(); Instant expectedDeadline = feedbackSession.getEndTime().plus(Duration.ofHours(12)); - verifyUpdatedDeadlinesMap(updatedStudentDeadlines, TestProperties.TEST_EMAIL, "charlie.tmms@gmail.tmt"); + verifyUpdatedDeadlinesMap(updatedStudentDeadlines, testEmail, "charlie.tmms@gmail.tmt"); verifyUpdatedDeadlinesMap(updatedInstructorDeadlines, "instructor1.tmms@gmail.tmt"); verifyDeadlineExtensionsPresentOrAbsent(updatedStudentDeadlines, updatedInstructorDeadlines, expectedDeadline); @@ -87,7 +87,7 @@ public void testAll() { updatedStudentDeadlines = updatedSession.getStudentDeadlines(); updatedInstructorDeadlines = updatedSession.getInstructorDeadlines(); - verifyUpdatedDeadlinesMap(updatedStudentDeadlines, TestProperties.TEST_EMAIL, "charlie.tmms@gmail.tmt"); + verifyUpdatedDeadlinesMap(updatedStudentDeadlines, testEmail, "charlie.tmms@gmail.tmt"); verifyUpdatedDeadlinesMap(updatedInstructorDeadlines, "instructor1.tmms@gmail.tmt"); verifyDeadlineExtensionsPresentOrAbsent(updatedStudentDeadlines, updatedInstructorDeadlines, expectedDeadline); From 7f656f6d88ca4cc9b9519e5a48c4760a17e2deba Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 29 Jan 2024 22:55:17 -0500 Subject: [PATCH 21/25] Update InstructorSessionIndividualExtensionPageE2ETest.json test case fix --- ...SessionIndividualExtensionPageE2ETest.json | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 9054bffb89a..a72e40102ab 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -275,5 +275,37 @@ "message": "

This notification is shown to students only

", "shown": false } + }, + "deadlineExtensions": { + "student1InCourse1Session1": { + "courseId": "tm.e2e.ISesIe.CS2104", + "feedbackSessionName": "First Session", + "userEmail": "alice.tmms@gmail.tmt", + "isInstructor": false, + "endTime": "2032-05-01T05:00:00Z", + "sentClosingEmail": false, + "createdAt": "2032-05-01T01:00:00Z", + "updatedAt": "2032-05-01T01:00:00Z" + }, + "student2InCourse1Session1": { + "courseId": "tm.e2e.ISesIe.CS2104", + "feedbackSessionName": "First Session", + "userEmail": "charlie.tmms@gmail.tmt", + "isInstructor": false, + "endTime": "2032-05-01T05:00:00Z", + "sentClosingEmail": false, + "createdAt": "2032-05-01T01:00:00Z", + "updatedAt": "2032-05-01T01:00:00Z" + }, + "instructor1InCourse1Session1": { + "courseId": "tm.e2e.ISesIe.CS2104", + "feedbackSessionName": "First Session", + "userEmail": "instructor1.tmms@gmail.tmt", + "isInstructor": true, + "endTime": "2032-05-01T05:00:00Z", + "sentClosingEmail": false, + "createdAt": "2032-05-01T01:00:00Z", + "updatedAt": "2032-05-01T01:00:00Z" + } } } From aaa6505f52b67f28cae3e8f4392568b8f2fca541 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Sat, 24 Feb 2024 22:09:13 -0500 Subject: [PATCH 22/25] removed unnecessary mock data --- .../InstructorSessionIndividualExtensionPageE2ETest.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index a72e40102ab..4780a0e3fa7 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -21,12 +21,6 @@ "name": "Programming Language Concepts", "institute": "TEAMMATES Test Institute 1", "timeZone": "Asia/Singapore" - }, - "course2": { - "id": "tm.e2e.ISesIe.CS2105", - "name": "Programming Language Concepts", - "institute": "TEAMMATES Test Institute 1", - "timeZone": "Asia/Singapore" } }, "instructors": { From eba76eaaffeade1cfda4f2176019679f41c3d5d0 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Tue, 26 Mar 2024 14:35:46 -0400 Subject: [PATCH 23/25] Update InstructorSessionIndividualExtensionPageE2ETest.json removed unwanted mock data --- ...SessionIndividualExtensionPageE2ETest.json | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index 169e2818b56..dba5a1a8be5 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -230,30 +230,7 @@ } }, "feedbackResponseComments": {}, - "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": "

This notification is shown to general users

", - "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": "

This notification is shown to students only

", - "shown": false - } - }, + "notifications": {}, "deadlineExtensions": { "student1InCourse1Session1": { "courseId": "tm.e2e.ISesIe.CS2104", From 8ef6628f7302034383f48ccc9ce5b7433d359e0f Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Thu, 20 Jun 2024 19:58:36 -0400 Subject: [PATCH 24/25] Update InstructorStudentActivityLogsPageE2ETest.json E2E-testing (firefox, unstable) test failure issue fix --- .../data/InstructorStudentActivityLogsPageE2ETest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/resources/data/InstructorStudentActivityLogsPageE2ETest.json b/src/e2e/resources/data/InstructorStudentActivityLogsPageE2ETest.json index 2f00581b393..ba15c92cfd0 100644 --- a/src/e2e/resources/data/InstructorStudentActivityLogsPageE2ETest.json +++ b/src/e2e/resources/data/InstructorStudentActivityLogsPageE2ETest.json @@ -43,7 +43,7 @@ "students": { "alice.tmms@ISActLogs.CS2104": { "googleId": "tm.e2e.ISActLogs.alice.tmms", - "email": "alice.b.tmms@gmail.tmt", + "email": "alice.tmms@gmail.tmt", "course": "tm.e2e.ISActLogs.CS2104", "name": "Alice Betsy", "comments": "This student's name is Alice Betsy", From 4e6a651c820e79ca7228f1a9c43de1ba55a46c16 Mon Sep 17 00:00:00 2001 From: Suneel Valmeti Date: Mon, 8 Jul 2024 11:46:43 -0400 Subject: [PATCH 25/25] Update InstructorSessionIndividualExtensionPageE2ETest.json email id's changes reverted as per PR reviewer comments. --- .../data/InstructorSessionIndividualExtensionPageE2ETest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json index dba5a1a8be5..dc0fb0ede23 100644 --- a/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json +++ b/src/e2e/resources/data/InstructorSessionIndividualExtensionPageE2ETest.json @@ -219,8 +219,8 @@ "feedbackSessionName": "First Session", "courseId": "tm.e2e.ISesIe.CS2104", "feedbackQuestionId": "1", - "giver": "danny.tmms@gmail.tmt", - "recipient": "danny.tmms@gmail.tmt", + "giver": "ISesIe.danny.tmms@gmail.tmt", + "recipient": "ISesIe.danny.tmms@gmail.tmt", "giverSection": "None", "recipientSection": "None", "responseDetails": {