update login user

01_Web/PageObject/LoginPage.js

@@ -32,7 +32,7 @@ class Login_Page {
     }
 
 
-    loginMerchant = async function (driver, email='[email protected]', password ='changeme' ){
+    loginMerchant = async function (driver, email='[email protected]', password ='Aa@666666' ){
         console.log("Login with email: " + email);
         await baseStep.waitUntilElement(driver, this.email,20000);
         await baseStep.input(driver,  this.email, email);

01_Web/TestCases/MerchantPortal/03_billable_metric_merchant.js

@@ -61,12 +61,7 @@ describe('Add billable metric in Merchant Portal, Aggregation Type = count=> Suc
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -146,12 +141,7 @@ describe('Add billable metric in Merchant Portal, Aggregation Type = count uniqu
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -232,12 +222,7 @@ describe('Add billable metric in Merchant Portal, Aggregation Type = latest=> Su
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -318,12 +303,7 @@ describe('Add billable metric in Merchant Portal, Aggregation Type = max=> Succe
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -404,12 +384,7 @@ describe('Add billable metric in Merchant Portal, Aggregation Type = sum=> Succe
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);

01_Web/TestCases/MerchantPortal/04_discount_code_merchant.js

@@ -61,12 +61,7 @@ describe('Add discount code in Merchant Portal, one time use, percentage=> Succe
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -153,12 +148,7 @@ describe('Add discount code in Merchant Portal, Recurring, percentage=> Success'
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -246,12 +236,7 @@ describe('Add discount code in Merchant Portal, one time use, fixed amount=> Suc
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);
@@ -339,12 +324,7 @@ describe('Add discount code in Merchant Portal, Recurring, fixed amount=> Succes
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
                 await baseStep.waitUntilElement(Driver, loginPage.email,20000);
-                await baseStep.input(Driver,  loginPage.email, '[email protected]');
-                await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
-                await baseStep.wait(Driver, 1000);
-                await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
-                await baseStep.click(Driver, loginPage.submitBtn);
+                await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver,savaPath + '/02_Menu.jpeg');
                 await baseStep.wait(Driver, 1000);