Merge branch 'main' into 'master'

01_Web/PageObject/MerchantUserListPage.js

@@ -33,10 +33,10 @@ class MerchantUserListPage {
     suspend_btn = '//*[text()="Suspend"]'
     suspend_confirm_btn = '(//*[text()=\'Suspend\'])[2]'
     assign_sub_btn = '//*[text()="Assign Subscription"]'
-    plan_selector = '(//input[@type="search"]/../..)[2]'
+    plan_selector = '(//input[@type="search"]/../..)'
     assign_OK_btn = '//*[text()="OK"]'
     current_text = '(//*[@class="ant-divider-inner-text"])[6]'
-    current_plan = "(//*[text()='Plan'])[2]/following-sibling::div[1]"
+    current_plan = "//*[text()='Plan']/following-sibling::div[1]"
     current_plan_des = "(//*[text()='Plan Description'])[1]/following-sibling::div[1]"
     current_status= "(//*[text()='Status'])[3]//following-sibling::div[1]/span"
 
@@ -72,7 +72,12 @@ class MerchantUserListPage {
 
     selectTargetPlan = async function  (driver, Plan){
         console.log("select Plan name: " , Plan);
-        await baseStep.click(driver, this.plan_selector);
+        try{
+            await baseStep.click(driver, this.plan_selector + "[2]");
+        }
+        catch (e){
+            await baseStep.click(driver, this.plan_selector + "[3]");
+        }
         await baseStep.click(driver, "//*[contains(text(),'"+Plan+"')]");
         await baseStep.wait(driver, 1000);
     }