Commit b2d890e

committed

Add more select options for CDP Mode

1 parent ae9021d commit b2d890eCopy full SHA for b2d890e

File tree

+41

-0

lines changed

+41

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,8 @@ sb.cdp.mouse_click(selector, timeout=None)`
`399`	`399`	`sb.cdp.nested_click(parent_selector, selector)`
`400`	`400`	`sb.cdp.get_nested_element(parent_selector, selector)`
`401`	`401`	`sb.cdp.select_option_by_text(dropdown_selector, option)`
	`402`	`+sb.cdp.select_option_by_index(dropdown_selector, option)`
	`403`	`+sb.cdp.select_option_by_value(dropdown_selector, option)`
`402`	`404`	`sb.cdp.flash(selector, duration=1, color="44CC88", pause=0)`
`403`	`405`	`sb.cdp.highlight(selector)`
`404`	`406`	`sb.cdp.focus(selector)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,8 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):`
`808`	`808`	`cdp.get_window_size = CDPM.get_window_size`
`809`	`809`	`cdp.nested_click = CDPM.nested_click`
`810`	`810`	`cdp.select_option_by_text = CDPM.select_option_by_text`
	`811`	`+ cdp.select_option_by_index = CDPM.select_option_by_index`
	`812`	`+ cdp.select_option_by_value = CDPM.select_option_by_value`
`811`	`813`	`cdp.flash = CDPM.flash`
`812`	`814`	`cdp.highlight = CDPM.highlight`
`813`	`815`	`cdp.focus = CDPM.focus`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -823,6 +823,37 @@ def select_option_by_text(self, dropdown_selector, option):`
`823`	`823`	`% (dropdown_selector, option)`
`824`	`824`	`)`
`825`	`825`
	`826`	`+ def select_option_by_index(self, dropdown_selector, option):`
	`827`	`+ element = self.find_element(dropdown_selector)`
	`828`	`+ element.scroll_into_view()`
	`829`	`+ options = element.query_selector_all("option")`
	`830`	`+ count = 0`
	`831`	`+ for found_option in options:`
	`832`	`+ if count == int(option):`
	`833`	`+ found_option.select_option()`
	`834`	`+ return`
	`835`	`+ count += 1`
	`836`	`+ raise Exception(`
	`837`	`+ "Unable to find index option {%s} in dropdown {%s}!"`
	`838`	`+ % (dropdown_selector, option)`
	`839`	`+ )`
	`840`	`+`
	`841`	`+ def select_option_by_value(self, dropdown_selector, option):`
	`842`	`+ element = self.find_element(dropdown_selector)`
	`843`	`+ element.scroll_into_view()`
	`844`	`+ options = element.query_selector_all("option")`
	`845`	`+ for found_option in options:`
	`846`	`+ if (`
	`847`	`+ "value" in found_option.attrs`
	`848`	`+ and str(found_option.attrs["value"]) == str(option)`
	`849`	`+ ):`
	`850`	`+ found_option.select_option()`
	`851`	`+ return`
	`852`	`+ raise Exception(`
	`853`	`+ "Unable to find value option {%s} in dropdown {%s}!"`
	`854`	`+ % (dropdown_selector, option)`
	`855`	`+ )`
	`856`	`+`
`826`	`857`	`def flash(`
`827`	`858`	`self,`
`828`	`859`	`selector, # The CSS Selector to flash`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3198,6 +3198,9 @@ def select_option_by_index(`
`3198`	`3198`	`timeout = settings.SMALL_TIMEOUT`
`3199`	`3199`	`if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:`
`3200`	`3200`	`timeout = self.__get_new_timeout(timeout)`
	`3201`	`+ if self.__is_cdp_swap_needed():`
	`3202`	`+ self.cdp.select_option_by_index(dropdown_selector, option)`
	`3203`	`+ return`
`3201`	`3204`	`self.__select_option(`
`3202`	`3205`	`dropdown_selector,`
`3203`	`3206`	`option,`
`@@ -3222,6 +3225,9 @@ def select_option_by_value(`
`3222`	`3225`	`timeout = settings.SMALL_TIMEOUT`
`3223`	`3226`	`if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:`
`3224`	`3227`	`timeout = self.__get_new_timeout(timeout)`
	`3228`	`+ if self.__is_cdp_swap_needed():`
	`3229`	`+ self.cdp.select_option_by_value(dropdown_selector, option)`
	`3230`	`+ return`
`3225`	`3231`	`self.__select_option(`
`3226`	`3232`	`dropdown_selector,`
`3227`	`3233`	`option,`

Comments

(0)