Update version 1.6.0 PREVIEW

Author: vothaian

pom.xml

@@ -16,9 +16,8 @@
         <java-compiler.version>8</java-compiler.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-
         <selenium.version>4.3.0</selenium.version>
-        <testng.version>7.6.1</testng.version>
+        <testng.version>7.4.0</testng.version>
         <webdrivermanager.version>5.2.1</webdrivermanager.version>
         <aspectjweaver.version>1.9.9.1</aspectjweaver.version>
         <ashot.version>1.5.4</ashot.version>
@@ -331,7 +330,6 @@
                             <!-- Call Suite name global set up above -->
                             <suiteXmlFile>${suite.client.simple}</suiteXmlFile>
                         </suiteXmlFiles>
-
                         <argLine>
                             -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjweaver.version}/aspectjweaver-${aspectjweaver.version}.jar"
                         </argLine>

src/test/java/anhtester/com/projects/website/crm/pages/Clients/ClientPage.java

@@ -42,7 +42,8 @@ public void addClient(Hashtable<String, String> data) {
         WebUI.clickElement(ObjectUtils.getObject("buttonSaveOnDialog"));
 
         WebUI.setText(ObjectUtils.getObject("inputSearch"), data.get(ClientModel.getCompanyName()));
-        WebUI.sleep(2);
+        WebUI.waitForPageLoaded();
+        WebUI.sleep(3);
         WebUI.checkContainsSearchTableByColumn(2, data.get(ClientModel.getCompanyName()));
         checkClientDetail(data);
     }

src/test/java/anhtester/com/projects/website/crm/testcases/TestHandle.java

@@ -13,7 +13,6 @@
 import anhtester.com.projects.website.crm.pages.Projects.ProjectPage;
 import anhtester.com.projects.website.crm.pages.SignIn.SignInPage;
 import anhtester.com.utils.LocalStorageUtils;
-import anhtester.com.utils.Log;
 import anhtester.com.utils.ObjectUtils;
 import anhtester.com.utils.WebUI;
 import com.google.zxing.NotFoundException;
@@ -340,17 +339,18 @@ public void handleUploadFile() {
         WebUI.sleep(1);
 
         //Cách 1 sendKeys link từ source
-        WebUI.uploadFileSendkeys(By.xpath("//input[@id='uploadFile']"), Helpers.getCurrentDir() + "src/test/resources/DOCX_File_01.docx");
+        WebUI.uploadFileSendkeys(By.xpath("//input[@id='uploadFile']"), Helpers.getCurrentDir() + "src\\test\\resources\\testdatafile\\DOCX_File_01.docx");
+
+        WebUI.sleep(1);
 
         //Cách 2 mở form local máy nên file là trong ổ đĩa máy tính
-        WebUI.uploadFileForm(By.xpath("//input[@id='uploadFile']"), "D:\\Document.csv");
+        WebUI.uploadFileForm(By.xpath("//input[@id='uploadFile']"), Helpers.getCurrentDir() + "src\\test\\resources\\testdatafile\\LoginCSV.csv");
 
         WebUI.sleep(3);
     }
 
     @Test
     public void handleTable1() {
-        Log.info("handleTable1");
         WebUI.getToUrl("https://colorlib.com/polygon/notika/data-table.html");
         System.out.println(WebUI.getValueTableByColumn(2));
     }
@@ -376,7 +376,8 @@ public void handlePrintPopup() throws AWTException {
         WebUI.waitForPageLoaded();
         String originalWindow = driver.getWindowHandle();
 
-        WebUI.clickElement(By.xpath("//td[normalize-space()='user01@anhtester.com']"));
+        WebUI.setText(By.id("email"), "admin@mailinator.com");
+        WebUI.setText(By.id("password"), "123456");
         WebUI.clickElement(By.xpath("//button[normalize-space()='Login']"));
         WebUI.waitForPageLoaded();
         WebUI.clickElement(By.xpath("//a[@role='button']"));
@@ -419,7 +420,6 @@ public void handlePrintPopup() throws AWTException {
 
     @Test
     public void handleAuthentication() {
-
         // Authentication username & password
         String username = "admin";
         String password = "admin";