Merge branch 'main' into 'master'

01_Web/PageObject/LoginPage.js

@@ -15,7 +15,7 @@ class Login_Page {
     error_message = '//input[@id="login-password_password"]/../../../../../../following-sibling::div[2]'
     user_error_message = '//input[@id="login-with-password_password"]/../../../../../../following-sibling::div[2]'
     // http://unibee:[email protected]/
-    openMerchantUrl = async function (driver, url = 'http://localhost/'){
+    openMerchantUrl = async function (driver, url = 'http://unibee:[email protected]/'){
         console.log("Open URL: " + url);
         await baseStep.access_url(driver,url);
         await baseStep.wait(driver, 3000);
@@ -23,7 +23,7 @@ class Login_Page {
         console.log("currentUrl: " + currentUrl);
     }
     // http://unibee:[email protected]/
-    openUserUrl = async function (driver, url = 'http://localhost:8086/plans'){
+    openUserUrl = async function (driver, url = 'http://unibee:[email protected]/'){
         console.log("Open URL: " + url);
         await baseStep.access_url(driver,url);
         await baseStep.wait(driver, 3000);

01_Web/TestCases/MerchantPortal/01_login_merchant.js

@@ -60,9 +60,9 @@ describe('Login in Merchant Portal=> Success', function() {
                 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.input(Driver,  loginPage.email, '[email protected]');
                 await baseStep.wait(Driver, 2000);
-                await baseStep.input(Driver,loginPage.password, 'changeme');
+                await baseStep.input(Driver,loginPage.password, 'Aa@666666');
                 await baseStep.wait(Driver, 2000);
                 await baseStep.screenShot(Driver,savaPath + '/01_login.jpeg');
                 await baseStep.click(Driver, loginPage.submitBtn);
@@ -132,7 +132,7 @@ describe('Login failed with wrong password in Merchant Portal=> Success', functi
                 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.input(Driver,  loginPage.email, '[email protected]');
                 await baseStep.wait(Driver, 2000);
                 await baseStep.input(Driver,loginPage.password, '123123');
                 await baseStep.click(Driver, loginPage.submitBtn);