From 65466c4b5f0ec7c8a8b3fde5f48fc6fa19659b6f Mon Sep 17 00:00:00 2001 From: tejasker Date: Sat, 16 Dec 2023 12:04:23 +0530 Subject: [PATCH 01/10] fixed changes & made responsive drop down for the indtructor home page --- .../instructor-home-page.component.html | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html index ef138c4b800..422ebfa2ee9 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html @@ -39,14 +39,14 @@

Home

-
[{{ courseTabModel.course.courseId }}]: {{ courseTabModel.course.courseName }}
- + -
+ - + -
+ - + -
+ - + -
+
Date: Sun, 17 Dec 2023 11:01:39 +0530 Subject: [PATCH 02/10] resolved the issues that are causing test cases that are failing --- ...nstructor-home-page.component.spec.ts.snap | 32 +++++++++++++++---- .../instructor-home-page.component.html | 2 +- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap index 338b30b5d23..6458b9ae4ca 100644 --- a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap @@ -262,7 +262,7 @@ exports[`InstructorHomePageComponent should snap with one course with error load id="course-tab-0" >
-
+
Date: Mon, 18 Dec 2023 00:27:51 +0530 Subject: [PATCH 03/10] resolved the Component testing issues that is causing test cases fail. --- .../instructor-home-page.component.spec.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts index 41ba19d91a7..54d314d03b3 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts @@ -205,8 +205,13 @@ describe('InstructorHomePageComponent', () => { const courseButton: any = fixture.debugElement.nativeElement.querySelector('.btn-course'); courseButton.click(); - const archiveButton: any = fixture.debugElement.nativeElement.querySelector('.btn-archive-course'); - archiveButton.click(); + const archiveButton: any = document.querySelector('body > div > div >a.btn-archive-course.btn '); + // Checking archiveButton + if (archiveButton) { + archiveButton.click(); + } else { + console.error('Archive button not found'); + } expect(component.courseTabModels.length).toEqual(1); expect(component.courseTabModels[0].course.courseId).toEqual('CS3281'); @@ -233,8 +238,13 @@ describe('InstructorHomePageComponent', () => { const courseButton: any = fixture.debugElement.nativeElement.querySelector('.btn-course'); courseButton.click(); - const archiveButton: any = fixture.debugElement.nativeElement.querySelector('.btn-delete-course'); - archiveButton.click(); + const deleteButton: any = document.querySelector('body > div > div > a.btn-delete-course.btn'); + // Checking deleteButton + if (deleteButton) { + deleteButton.click(); + } else { + console.error('Delete button not found'); + } expect(component.courseTabModels.length).toEqual(1); expect(component.courseTabModels[0].course.courseId).toEqual('CS3281'); From 1a2b8e47e251f15779d6f911acde1314028eedeb Mon Sep 17 00:00:00 2001 From: tejasker Date: Mon, 18 Dec 2023 00:56:14 +0530 Subject: [PATCH 04/10] resolved the E2E testing issues. --- .../java/teammates/e2e/pageobjects/InstructorHomePage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index d031daef4dc..83e7539dfc6 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -119,14 +119,14 @@ public void deleteSession(int courseTabIndex, int sessionIndex) { public void archiveCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.className("btn-archive-course"))); + clickAndConfirm(courseTab.findElement(By.className("a.btn-archive-course"))); waitUntilAnimationFinish(); } public void deleteCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.className("btn-delete-course"))); + clickAndConfirm(courseTab.findElement(By.className("a.btn-delete-course"))); waitUntilAnimationFinish(); } From f1e1b36b5e1de899c81e3505057ccdda790e4913 Mon Sep 17 00:00:00 2001 From: tejasker Date: Mon, 18 Dec 2023 11:51:03 +0530 Subject: [PATCH 05/10] resolved the E2E testing issues. --- src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 83e7539dfc6..348d5e9092c 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -119,7 +119,7 @@ public void deleteSession(int courseTabIndex, int sessionIndex) { public void archiveCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.className("a.btn-archive-course"))); + clickAndConfirm(courseTab.findElement(By.cssSelector("a.btn-archive-course.btn.btn-light.btn-sm.dropdown-item.ng-tns-c164-1"))); waitUntilAnimationFinish(); } From 556c609cba9617e9875186b035274144e4f1970d Mon Sep 17 00:00:00 2001 From: tejasker Date: Mon, 18 Dec 2023 11:52:22 +0530 Subject: [PATCH 06/10] resolved the E2E testing issues. --- src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 348d5e9092c..2f26a407df2 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -126,7 +126,7 @@ public void archiveCourse(int courseTabIndex) { public void deleteCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.className("a.btn-delete-course"))); + clickAndConfirm(courseTab.findElement(By.cssSelector("a.btn-delete-course"))); waitUntilAnimationFinish(); } From a2c47de5a90ee3fd25c1b293b43ba3a3eb48375c Mon Sep 17 00:00:00 2001 From: tejasker Date: Mon, 18 Dec 2023 15:00:19 +0530 Subject: [PATCH 07/10] resolved the E2E testing issues. --- src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 2f26a407df2..346d919447a 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -119,7 +119,7 @@ public void deleteSession(int courseTabIndex, int sessionIndex) { public void archiveCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.cssSelector("a.btn-archive-course.btn.btn-light.btn-sm.dropdown-item.ng-tns-c164-1"))); + clickAndConfirm(courseTab.findElement(By.cssSelector("body > div > div >a.btn-archive-course.btn"))); waitUntilAnimationFinish(); } From b0cf61782fb000418ce04484e4fa8a2d4ae5db4b Mon Sep 17 00:00:00 2001 From: tejasker Date: Mon, 18 Dec 2023 20:08:21 +0530 Subject: [PATCH 08/10] resolved the E2E testing issues. --- src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 346d919447a..f7f8f524dcc 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -119,7 +119,7 @@ public void deleteSession(int courseTabIndex, int sessionIndex) { public void archiveCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.cssSelector("body > div > div >a.btn-archive-course.btn"))); + clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div >a.btn-archive-course.btn"))); waitUntilAnimationFinish(); } From 1dc6015fa897ec3079cabeb265399cc8d25f1f27 Mon Sep 17 00:00:00 2001 From: tejasker Date: Tue, 19 Dec 2023 11:09:22 +0530 Subject: [PATCH 09/10] resolved the E2E testing issues. --- src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index f7f8f524dcc..2e59337c6c6 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -126,7 +126,7 @@ public void archiveCourse(int courseTabIndex) { public void deleteCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(courseTab.findElement(By.cssSelector("a.btn-delete-course"))); + clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div > a.btn-delete-course.btn"))); waitUntilAnimationFinish(); } From 0d5bd0cde85bb3eb572cfe94ef9b9b21126375c3 Mon Sep 17 00:00:00 2001 From: tejasker Date: Wed, 20 Dec 2023 20:33:31 +0530 Subject: [PATCH 10/10] modified & made small adjustments in the code as required --- .../e2e/pageobjects/InstructorHomePage.java | 4 ++-- ...instructor-home-page.component.spec.ts.snap | 12 ++++++------ .../instructor-home-page.component.html | 10 +++++----- .../instructor-home-page.component.spec.ts | 18 ++++-------------- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 2e59337c6c6..10dff2a76cf 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -119,14 +119,14 @@ public void deleteSession(int courseTabIndex, int sessionIndex) { public void archiveCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div >a.btn-archive-course.btn"))); + clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div > .btn-archive-course"))); waitUntilAnimationFinish(); } public void deleteCourse(int courseTabIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-course"))); - clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div > a.btn-delete-course.btn"))); + clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div > .btn-delete-course"))); waitUntilAnimationFinish(); } diff --git a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap index 6458b9ae4ca..a1abb91ae88 100644 --- a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap @@ -262,7 +262,7 @@ exports[`InstructorHomePageComponent should snap with one course with error load id="course-tab-0" >
Home
-
[{{ courseTabModel.course.courseId }}]: {{ courseTabModel.course.courseName }}
-
+
Enroll @@ -59,15 +59,15 @@

Home

-
+ -
+
Add diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts index 54d314d03b3..7c592109bc4 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts @@ -205,13 +205,8 @@ describe('InstructorHomePageComponent', () => { const courseButton: any = fixture.debugElement.nativeElement.querySelector('.btn-course'); courseButton.click(); - const archiveButton: any = document.querySelector('body > div > div >a.btn-archive-course.btn '); - // Checking archiveButton - if (archiveButton) { - archiveButton.click(); - } else { - console.error('Archive button not found'); - } + const archiveButton: any = document.querySelector('body > div > div > .btn-archive-course'); + archiveButton.click(); expect(component.courseTabModels.length).toEqual(1); expect(component.courseTabModels[0].course.courseId).toEqual('CS3281'); @@ -238,13 +233,8 @@ describe('InstructorHomePageComponent', () => { const courseButton: any = fixture.debugElement.nativeElement.querySelector('.btn-course'); courseButton.click(); - const deleteButton: any = document.querySelector('body > div > div > a.btn-delete-course.btn'); - // Checking deleteButton - if (deleteButton) { - deleteButton.click(); - } else { - console.error('Delete button not found'); - } + const deleteButton: any = document.querySelector('body > div > div > .btn-delete-course'); + deleteButton.click(); expect(component.courseTabModels.length).toEqual(1); expect(component.courseTabModels[0].course.courseId).toEqual('CS3281');