[#13066] Combine Admin Add Account Request Flow into Instructor Account Request Flow

src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java

@@ -26,26 +26,25 @@ public void testAll() {
         AdminHomePage homePage = loginAdminToPage(url, AdminHomePage.class);
 
         ______TS("Test adding instructors with both valid and invalid details");
-
         String name = "AHPUiT Instrúctör WithPlusInEmail";
         String email = "[email protected]";
         String institute = "TEAMMATES Test Institute 1";
-
         homePage.queueInstructorForAdding(name, email, institute);
 
         String singleLineDetails = "Instructor With Invalid Email | invalidemail | TEAMMATES Test Institute 1";
-
         homePage.queueInstructorForAdding(singleLineDetails);
-
-        homePage.addAllInstructors();
-
-        String successMessage = homePage.getMessageForInstructor(0);
-        assertTrue(successMessage.contains(
-                "Instructor \"AHPUiT Instrúctör WithPlusInEmail\" has been successfully created"));
-
-        String failureMessage = homePage.getMessageForInstructor(1);
-        assertTrue(failureMessage.contains(
-                "\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not in the correct format."));
+        homePage.verifyStatusMessage("\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not "
+                + "in the correct format. An email address contains some text followed by one '@' sign followed by some "
+                + "more text, and should end with a top level domain address like .com. It cannot be longer than 254 "
+                + "characters, cannot be empty and cannot contain spaces.");
+
+        ______TS("Verify that newly added instructor appears in account request table");
+        homePage.verifyInstructorInAccountRequestTable(name, email, institute);
+
+        ______TS("Test approving a valid account request");
+        homePage.clickApproveAccountRequestButton(name, email, institute);
+        homePage.verifyStatusMessage("Account request was successfully approved. Email has been sent to "
+                + "[email protected].");
     }
 
 }

src/e2e/java/teammates/e2e/cases/sql/AdminHomePageE2ETest.java

@@ -23,33 +23,25 @@ public void testAll() {
         AdminHomePage homePage = loginAdminToPage(url, AdminHomePage.class);
 
         ______TS("Test adding instructors with both valid and invalid details");
-
         String name = "AHPUiT Instrúctör WithPlusInEmail";
         String email = "[email protected]";
         String institute = "TEAMMATES Test Institute 1";
-
         homePage.queueInstructorForAdding(name, email, institute);
 
         String singleLineDetails = "Instructor With Invalid Email | invalidemail | TEAMMATES Test Institute 1";
-
         homePage.queueInstructorForAdding(singleLineDetails);
-
-        homePage.addAllInstructors();
-
-        String successMessage = homePage.getMessageForInstructor(0);
-        assertTrue(successMessage.contains(
-                "Instructor \"AHPUiT Instrúctör WithPlusInEmail\" has been successfully created"));
-
-        String failureMessage = homePage.getMessageForInstructor(1);
-        assertTrue(failureMessage.contains(
-                "\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not in the correct format."));
-
-        homePage.reloadPage();
+        homePage.verifyStatusMessage("\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not "
+                + "in the correct format. An email address contains some text followed by one '@' sign followed by some "
+                + "more text, and should end with a top level domain address like .com. It cannot be longer than 254 "
+                + "characters, cannot be empty and cannot contain spaces.");
 
         ______TS("Verify that newly added instructor appears in account request table");
-
         homePage.verifyInstructorInAccountRequestTable(name, email, institute);
 
+        ______TS("Test approving a valid account request");
+        homePage.clickApproveAccountRequestButton(name, email, institute);
+        homePage.verifyStatusMessage("Account request was successfully approved. Email has been sent to "
+                + "[email protected].");
     }
 
 }

src/e2e/java/teammates/e2e/pageobjects/AdminHomePage.java

@@ -36,9 +36,6 @@ public class AdminHomePage extends AppPage {
     @FindBy (id = "add-instructor-single-line")
     private WebElement submitButtonDetailsSingleLineForm;
 
-    @FindBy (id = "add-all-instructors")
-    private WebElement addAllInstructorsButton;
-
     public AdminHomePage(Browser browser) {
         super(browser);
     }
@@ -69,19 +66,13 @@ public void queueInstructorForAdding(String instructorDetails) {
         click(submitButtonDetailsSingleLineForm);
     }
 
-    public void addAllInstructors() {
-        click(addAllInstructorsButton);
-        waitForElementToBeClickable(addAllInstructorsButton);
-    }
-
-    public String getMessageForInstructor(int i) {
-        By by = By.id("message-instructor-" + i);
-        waitForElementVisibility(by);
-        WebElement element = browser.driver.findElement(by);
-        if (element == null) {
-            return null;
-        }
-        return element.getText();
+    public void clickApproveAccountRequestButton(String name, String email, String institute) {
+        WebElement accountRequestRow = getAccountRequestRow(name, email, institute);
+        waitForElementPresence(By.cssSelector("[id^='approve-account-request-']"));
+        WebElement approveButton = accountRequestRow.findElement(By.cssSelector("[id^='approve-account-request-']"));
+        waitForElementToBeClickable(approveButton);
+        approveButton.click();
+        waitForPageToLoad();
     }
 
     public void clickMoreInfoButtonForRegisteredInstructor(int i) {