Merge branch 'main' into 'master'

01_Web/PageObject/MerchantPlanPage.js

@@ -3,7 +3,7 @@ const webdriver = require('selenium-webdriver');
 const By = webdriver.By;
 
 class MerchantPlanPage {
-    menu_plan=  '//*[@class="ant-menu-title-content" and text()="Plan"]'
+    menu_plan=  '//*[@class="ant-menu-title-content" and text()="Product and Plan"]'
     // new_plan_btn= '//*[@class="anticon anticon-plus"]/../following-sibling::span[text()="New plan"]'
     new_plan_btn = '//*[@class="ant-btn-icon"]/span[@aria-label="plus"]'
     plan_name_label=  '//*[@for="planName"]'

01_Web/TestCases/EndToEndTest/01_purchase_plan.js

@@ -195,14 +195,14 @@ describe('Purchase plan=> Success', function() {
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
 

01_Web/TestCases/MerchantPortal/07_account_info.js

@@ -24,10 +24,10 @@ let response;
 let timeStamp = new Date();
 
 let Driver;
-let savaPath = __dirname + "/../../Report/Web/ScreenShot/07_Account_info/" + baseStep.getDateFormat(new Date(),"YYYY-MM-DD_HH:mm:ss");
+let savaPath = __dirname + "/../../Report/Web/ScreenShot/07_Account_info/" + baseStep.getDateFormat(new Date(), "YYYY-MM-DD_HH:mm:ss");
 let testData = [];
 let testUser = "[email protected]";
-describe('case01: update account info=> Success', function() {
+describe('case01: update account info=> Success', function () {
     this.timeout(9000000);
 
     beforeEach(function () {
@@ -53,13 +53,14 @@ describe('case01: update account info=> Success', function() {
                     Response: response
                 }
             });
-            addContext(this, {
-                title: 'EndTime',
-                value: {
-                    EndTime: timeStamp = new Date()
-                }
-            });
         }
+        addContext(this, {
+            title: 'EndTime',
+            value: {
+                EndTime: timeStamp = new Date()
+            }
+        });
+
     });
 
     it('case 01 - update my account info => Success  ', (done) => {
@@ -73,32 +74,31 @@ describe('case01: update account info=> Success', function() {
                 await loginPage.loginMerchant(Driver);
                 await baseStep.waitUntilElement(Driver, merchantMyAccount.menu_My_Account);
                 await baseStep.click(Driver, merchantMyAccount.menu_My_Account);
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await baseStep.inputWithClear(Driver, merchantMyAccount.company_name, "Automation Update Name");
                 await baseStep.inputWithClear(Driver, merchantMyAccount.physical_address, "Automation Update Address");
                 await baseStep.inputWithClear(Driver, merchantMyAccount.company_email, "[email protected]");
                 await baseStep.inputWithClear(Driver, merchantMyAccount.company_phone, "12345678910");
                 await baseStep.click(Driver, merchantMyAccount.save_btn);
-                await baseStep.wait(Driver,10000);
+                await baseStep.wait(Driver, 10000);
                 await baseStep.screenShot(Driver, savaPath + '/01_update_info');
                 await baseStep.compareValueText(Driver, merchantMyAccount.company_name, "Automation Update Name");
                 await baseStep.compareValueText(Driver, merchantMyAccount.physical_address, "Automation Update Address");
                 await baseStep.compareValueText(Driver, merchantMyAccount.company_email, "[email protected]");
                 await baseStep.compareValueText(Driver, merchantMyAccount.company_phone, "12345678910");
-                await baseStep.wait(Driver,3000);
+                await baseStep.wait(Driver, 3000);
                 await baseStep.inputWithClear(Driver, merchantMyAccount.company_name, "Automation Company");
                 await baseStep.inputWithClear(Driver, merchantMyAccount.physical_address, "Test Address");
                 await baseStep.inputWithClear(Driver, merchantMyAccount.company_email, "[email protected]");
                 await baseStep.inputWithClear(Driver, merchantMyAccount.company_phone, "15642543250");
                 await baseStep.click(Driver, merchantMyAccount.save_btn);
-                await baseStep.wait(Driver,10000);
+                await baseStep.wait(Driver, 10000);
                 await baseStep.screenShot(Driver, savaPath + '/02_revert_info');
-                await baseStep.wait(Driver,3000);
+                await baseStep.wait(Driver, 3000);
                 done();
-            }
-            catch (e) {
+            } catch (e) {
                 done(e);
-            }finally {
+            } finally {
                 await Driver.quit();
             }
         })();

01_Web/TestCases/MerchantPortal/09_user_list.js

@@ -22,10 +22,10 @@ let response;
 let timeStamp = new Date();
 
 let Driver;
-let savaPath = __dirname + "/../../Report/Web/ScreenShot/09_user_list/" + baseStep.getDateFormat(new Date(),"YYYY-MM-DD_HH:mm:ss");
+let savaPath = __dirname + "/../../Report/Web/ScreenShot/09_user_list/" + baseStep.getDateFormat(new Date(), "YYYY-MM-DD_HH:mm:ss");
 let testData = [];
 let testUser = "[email protected]";
-describe('case01: add user in user list=> Success', function() {
+describe('case01: add user in user list=> Success', function () {
     this.timeout(9000000);
 
     beforeEach(function () {
@@ -51,15 +51,15 @@ describe('case01: add user in user list=> Success', function() {
                     Response: response
                 }
             });
-            addContext(this, {
-                title: 'EndTime',
-                value: {
-                    EndTime: timeStamp = new Date()
-                }
-            });
         }
-    });
+        addContext(this, {
+            title: 'EndTime',
+            value: {
+                EndTime: timeStamp = new Date()
+            }
+        });
 
+    });
 
 
     it('case 01 - add a new user => Success  ', (done) => {
@@ -71,16 +71,16 @@ describe('case01: add user in user list=> Success', function() {
                 await loginPage.openMerchantUrl(Driver);
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
-                await baseStep.waitUntilElement(Driver, loginPage.email,20000);
+                await baseStep.waitUntilElement(Driver, loginPage.email, 20000);
                 await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.waitUntilElement(Driver, userListPage.menu_user_list);
                 await baseStep.click(Driver, userListPage.menu_user_list);
-                await baseStep.wait(Driver,2000);
+                await baseStep.wait(Driver, 2000);
                 await baseStep.click(Driver, userListPage.add_new_btn);
-                await baseStep.wait(Driver,2000);
+                await baseStep.wait(Driver, 2000);
                 let time = new Date().getTime();
-                await baseStep.input(Driver, userListPage.new_email, "Auto"+ time + "@test.com");
+                await baseStep.input(Driver, userListPage.new_email, "Auto" + time + "@test.com");
                 await baseStep.input(Driver, userListPage.new_ex_user_id, time);
                 await baseStep.input(Driver, userListPage.new_first_name, "Testing");
                 await baseStep.input(Driver, userListPage.new_last_name, "QA" + time);
@@ -88,22 +88,21 @@ describe('case01: add user in user list=> Success', function() {
                 await baseStep.input(Driver, userListPage.new_address, "Test Address");
                 await baseStep.screenShot(Driver, savaPath + "/01_add_user");
                 await baseStep.click(Driver, userListPage.new_OK_btn);
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver, savaPath + "/02_user_list");
-                await userListPage.checkRecordUserList(Driver, "Testing QA"+time, "Auto"+ time + "@test.com","Active");
-                await baseStep.scrollIntoView(Driver,userListPage.suspend_btn);
+                await userListPage.checkRecordUserList(Driver, "Testing QA" + time, "Auto" + time + "@test.com", "Active");
+                await baseStep.scrollIntoView(Driver, userListPage.suspend_btn);
                 await baseStep.click(Driver, userListPage.suspend_btn);
                 await baseStep.screenShot(Driver, savaPath + "/03_suspend_user");
                 await baseStep.click(Driver, userListPage.suspend_confirm_btn);
                 await baseStep.click(Driver, userListPage.menu_user_list);
-                await baseStep.wait(Driver,2000);
+                await baseStep.wait(Driver, 2000);
                 await baseStep.screenShot(Driver, savaPath + "/04_suspend_result");
-                await userListPage.checkRecordUserList(Driver, "Testing QA"+time, "Auto"+ time + "@test.com","Suspended");
+                await userListPage.checkRecordUserList(Driver, "Testing QA" + time, "Auto" + time + "@test.com", "Suspended");
                 done();
-            }
-            catch (e) {
+            } catch (e) {
                 done(e);
-            }finally {
+            } finally {
                 await Driver.quit();
             }
         })();
@@ -117,7 +116,7 @@ describe('case01: add user in user list=> Success', function() {
 
 });
 
-describe('case02: Assign subscription in user list=> Success', function() {
+describe('case02: Assign subscription in user list=> Success', function () {
     this.timeout(9000000);
 
     beforeEach(function () {
@@ -143,15 +142,15 @@ describe('case02: Assign subscription in user list=> Success', function() {
                     Response: response
                 }
             });
-            addContext(this, {
-                title: 'EndTime',
-                value: {
-                    EndTime: timeStamp = new Date()
-                }
-            });
         }
-    });
+        addContext(this, {
+            title: 'EndTime',
+            value: {
+                EndTime: timeStamp = new Date()
+            }
+        });
 
+    });
 
 
     it('case 01 - Assign a sub => Success  ', (done) => {
@@ -163,16 +162,16 @@ describe('case02: Assign subscription in user list=> Success', function() {
                 await loginPage.openMerchantUrl(Driver);
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
-                await baseStep.waitUntilElement(Driver, loginPage.email,20000);
+                await baseStep.waitUntilElement(Driver, loginPage.email, 20000);
                 await loginPage.loginMerchant(Driver)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.waitUntilElement(Driver, userListPage.menu_user_list);
                 await baseStep.click(Driver, userListPage.menu_user_list);
-                await baseStep.wait(Driver,2000);
+                await baseStep.wait(Driver, 2000);
                 await baseStep.click(Driver, userListPage.add_new_btn);
-                await baseStep.wait(Driver,2000);
+                await baseStep.wait(Driver, 2000);
                 let time = new Date().getTime();
-                await baseStep.input(Driver, userListPage.new_email, "Auto"+ time + "@test.com");
+                await baseStep.input(Driver, userListPage.new_email, "Auto" + time + "@test.com");
                 await baseStep.input(Driver, userListPage.new_ex_user_id, time);
                 await baseStep.input(Driver, userListPage.new_first_name, "Testing");
                 await baseStep.input(Driver, userListPage.new_last_name, "QA" + time);
@@ -180,28 +179,27 @@ describe('case02: Assign subscription in user list=> Success', function() {
                 await baseStep.input(Driver, userListPage.new_address, "Test Address");
                 await baseStep.screenShot(Driver, savaPath + "/05_add_user");
                 await baseStep.click(Driver, userListPage.new_OK_btn);
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver, savaPath + "/06_user_list");
-                await userListPage.checkRecordUserList(Driver, "Testing QA"+time, "Auto"+ time + "@test.com","Active");
+                await userListPage.checkRecordUserList(Driver, "Testing QA" + time, "Auto" + time + "@test.com", "Active");
                 await baseStep.click(Driver, userListPage.subscription_tab);
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await baseStep.click(Driver, userListPage.assign_sub_btn);
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await userListPage.selectTargetPlan(Driver, "Month Plan");
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await baseStep.screenShot(Driver, savaPath + "/07_assign_sub");
                 await baseStep.click(Driver, userListPage.assign_OK_btn);
-                await baseStep.wait(Driver,3000);
+                await baseStep.wait(Driver, 3000);
                 await baseStep.screenShot(Driver, savaPath + "/08_assign_result");
                 await baseStep.compareText(Driver, userListPage.current_text, "Current Subscription");
                 await baseStep.compareText(Driver, userListPage.current_plan, "Month Plan");
                 await baseStep.compareText(Driver, userListPage.current_plan_des, "Month Plan");
                 await baseStep.compareText(Driver, userListPage.current_status, "Incomplete");
                 done();
-            }
-            catch (e) {
+            } catch (e) {
                 done(e);
-            }finally {
+            } finally {
                 await Driver.quit();
             }
         })();

01_Web/TestCases/PrepareData/01_prepare_plan.js

@@ -42,14 +42,14 @@ describe('case01: create a new plan in Merchant Portal=> Success', function() {
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - create a new plan => Success  ', (done) => {
@@ -125,14 +125,14 @@ describe('case02: create a one time payment on  in Merchant Portal, => Success',
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - create a new plan, currency = JPY => Success  ', (done) => {
@@ -215,14 +215,14 @@ describe('Add discount code in Merchant Portal, one time use, percentage=> Succe
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - Add discount code in Merchant Portal, one time use, percentage => Success  ', (done) => {

01_Web/TestCases/UserPortal/01_login_user.js

@@ -40,14 +40,14 @@ describe('case01: Login in User portal=> Success', function() {
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - Login => Success  ', (done) => {
@@ -113,14 +113,14 @@ describe('case02: Login failed with wrong password in user Portal=> Success', fu
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - Login failed with wrong password => Success  ', (done) => {
@@ -182,14 +182,14 @@ describe('case03: Login failed with wrong email in User Portal=> Success', funct
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - Login failed with wrong email => Success  ', (done) => {
@@ -251,14 +251,14 @@ describe('case04: Login failed with empty email and password in user Portal=> Su
                 value: {
                     Response: response
                 }
-            });
+            }); }
             addContext(this, {
                 title: 'EndTime',
                 value: {
                     EndTime: timeStamp = new Date()
                 }
             });
-        }
+        
     });
 
     it('TC001 - Login failed with empty email and password => Success  ', (done) => {

01_Web/TestCases/UserPortal/03_purchanse_one_time_addon.js

@@ -22,11 +22,11 @@ let response;
 let timeStamp = new Date();
 
 let Driver;
-let savaPath = __dirname + "/../../Report/Web/ScreenShot/03_one_time_payment/" + baseStep.getDateFormat(new Date(),"YYYY-MM-DD_HH:mm:ss");
+let savaPath = __dirname + "/../../Report/Web/ScreenShot/03_one_time_payment/" + baseStep.getDateFormat(new Date(), "YYYY-MM-DD_HH:mm:ss");
 let testData = [];
 let testUser = "[email protected]";
 
-describe('case01: Purchase one time addon with credit card=> Success', function() {
+describe('case01: Purchase one time addon with credit card=> Success', function () {
     this.timeout(9000000);
 
     beforeEach(function () {
@@ -52,13 +52,14 @@ describe('case01: Purchase one time addon with credit card=> Success', function(
                     Response: response
                 }
             });
-            addContext(this, {
-                title: 'EndTime',
-                value: {
-                    EndTime: timeStamp = new Date()
-                }
-            });
         }
+        addContext(this, {
+            title: 'EndTime',
+            value: {
+                EndTime: timeStamp = new Date()
+            }
+        });
+
     });
 
 
@@ -68,37 +69,36 @@ describe('case01: Purchase one time addon with credit card=> Success', function(
                 // login
                 Driver = driver.getDriver(webdriver, 'chrome');
                 // Check Url
-                await loginPage.openUserUrl(Driver, );
+                await loginPage.openUserUrl(Driver,);
                 const currentUrl = await Driver.getCurrentUrl();
                 console.log('当前网址:', currentUrl);
-                await baseStep.waitUntilElement(Driver, loginPage.user_email,20000);
-                await loginPage.loginUserPortal(Driver,testUser)
+                await baseStep.waitUntilElement(Driver, loginPage.user_email, 20000);
+                await loginPage.loginUserPortal(Driver, testUser)
                 await baseStep.wait(Driver, 1000);
                 await baseStep.click(Driver, userPlanPage.menu_plan);
-                await baseStep.waitUntilElement(Driver, userPlanPage.plan_page_sign,20000);
+                await baseStep.waitUntilElement(Driver, userPlanPage.plan_page_sign, 20000);
                 await baseStep.click(Driver, userPlanPage.one_time_addons_tab)
                 // no content
                 await userPlanPage.selectPlan(Driver, 'one time payment');
                 await baseStep.click(Driver, userPlanPage.one_time_OK_btn);
-                await baseStep.wait(Driver,1000);
+                await baseStep.wait(Driver, 1000);
                 await baseStep.switchWindow(Driver);
-                await baseStep.waitUntilElement(Driver, userPlanPage.change_card_btn,20000);
+                await baseStep.waitUntilElement(Driver, userPlanPage.change_card_btn, 20000);
                 await baseStep.click(Driver, userPlanPage.change_card_btn);
-                await baseStep.input(Driver,userPlanPage.card_number, '4242424242424242');
-                await baseStep.input(Driver,userPlanPage.card_expiry, '1234');
-                await baseStep.wait(Driver,1000);
-                await baseStep.input(Driver,userPlanPage.card_cvc, '567');
-                await baseStep.wait(Driver,3000);
+                await baseStep.input(Driver, userPlanPage.card_number, '4242424242424242');
+                await baseStep.input(Driver, userPlanPage.card_expiry, '1234');
+                await baseStep.wait(Driver, 1000);
+                await baseStep.input(Driver, userPlanPage.card_cvc, '567');
+                await baseStep.wait(Driver, 3000);
                 await baseStep.click(Driver, userPlanPage.pay_btn);
-                await baseStep.waitUntilElement(Driver,userPlanPage.payment_success_sign,20000);
-                let actual_success_text = await  baseStep.getText(Driver,userPlanPage.payment_success_sign)
+                await baseStep.waitUntilElement(Driver, userPlanPage.payment_success_sign, 20000);
+                let actual_success_text = await baseStep.getText(Driver, userPlanPage.payment_success_sign)
                 await expect("Payment succeeded!").to.equal(actual_success_text)
-                await baseStep.wait(Driver,30000);
+                await baseStep.wait(Driver, 30000);
                 done();
-            }
-            catch (e) {
+            } catch (e) {
                 done(e);
-            }finally {
+            } finally {
                 await Driver.quit();
             }
         })();