Commit f610ee05 authored by YuShijiaCode's avatar YuShijiaCode

update xpath

parent 8cfef6b0
...@@ -33,10 +33,10 @@ class MerchantUserListPage { ...@@ -33,10 +33,10 @@ class MerchantUserListPage {
suspend_btn = '//*[text()="Suspend"]' suspend_btn = '//*[text()="Suspend"]'
suspend_confirm_btn = '(//*[text()=\'Suspend\'])[2]' suspend_confirm_btn = '(//*[text()=\'Suspend\'])[2]'
assign_sub_btn = '//*[text()="Assign Subscription"]' assign_sub_btn = '//*[text()="Assign Subscription"]'
plan_selector = '(//input[@type="search"]/../..)[2]' plan_selector = '(//input[@type="search"]/../..)'
assign_OK_btn = '//*[text()="OK"]' assign_OK_btn = '//*[text()="OK"]'
current_text = '(//*[@class="ant-divider-inner-text"])[6]' 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_plan_des = "(//*[text()='Plan Description'])[1]/following-sibling::div[1]"
current_status= "(//*[text()='Status'])[3]//following-sibling::div[1]/span" current_status= "(//*[text()='Status'])[3]//following-sibling::div[1]/span"
...@@ -72,7 +72,12 @@ class MerchantUserListPage { ...@@ -72,7 +72,12 @@ class MerchantUserListPage {
selectTargetPlan = async function (driver, Plan){ selectTargetPlan = async function (driver, Plan){
console.log("select Plan name: " , 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.click(driver, "//*[contains(text(),'"+Plan+"')]");
await baseStep.wait(driver, 1000); await baseStep.wait(driver, 1000);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment