Refactor and update methods
This commit is contained in:
Michael Mintz
parent
adbbd1992a
commit
f5e14b41c3
|
|
@ -21,33 +21,15 @@ self.double_click(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
|||
|
||||
self.click_chain(selectors_list, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT, spacing=0)
|
||||
|
||||
self.is_link_text_present(link_text)
|
||||
self.type(selector, text, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT, retry=False)
|
||||
|
||||
self.is_partial_link_text_present(link_text)
|
||||
self.update_text(selector, new_value, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT, retry=False)
|
||||
|
||||
self.get_link_attribute(link_text, attribute, hard_fail)
|
||||
self.add_text(selector, text, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_partial_link_text_attribute(link_text, attribute, hard_fail)
|
||||
self.send_keys(selector, text, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.wait_for_link_text_present(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.wait_for_partial_link_text_present(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.click_link_text(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.click_link(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.click_partial_link_text(partial_link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_text(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_attribute(selector, attribute, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.set_attribute(selector, attribute, value, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.remove_attribute(selector, attribute, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_property_value(selector, property, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
self.submit(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.refresh_page()
|
||||
|
||||
|
|
@ -65,25 +47,43 @@ self.go_back()
|
|||
|
||||
self.go_forward()
|
||||
|
||||
self.get_image_url(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.add_text(selector, text, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.send_keys(selector, text, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.update_text(selector, new_value, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT, retry=False)
|
||||
|
||||
self.type(selector, text, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT, retry=False)
|
||||
|
||||
self.is_element_present(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.is_element_visible(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.is_text_visible(text, selector="html", by=By.CSS_SELECTOR)
|
||||
|
||||
self.is_link_text_visible(link_text)
|
||||
|
||||
self.is_partial_link_text_visible(partial_link_text)
|
||||
|
||||
self.is_text_visible(text, selector="html", by=By.CSS_SELECTOR)
|
||||
self.is_link_text_present(link_text)
|
||||
|
||||
self.is_partial_link_text_present(link_text)
|
||||
|
||||
self.get_link_attribute(link_text, attribute, hard_fail)
|
||||
|
||||
self.get_link_text_attribute(link_text, attribute, hard_fail)
|
||||
|
||||
self.get_partial_link_text_attribute(link_text, attribute, hard_fail)
|
||||
|
||||
self.click_link_text(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.click_link(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.click_partial_link_text(partial_link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_text(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_attribute(selector, attribute, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.set_attribute(selector, attribute, value, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.remove_attribute(selector, attribute, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_property_value(selector, property, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.get_image_url(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.find_elements(selector, by=By.CSS_SELECTOR, limit=0)
|
||||
|
||||
|
|
@ -91,56 +91,64 @@ self.find_visible_elements(selector, by=By.CSS_SELECTOR, limit=0)
|
|||
|
||||
self.click_visible_elements(selector, by=By.CSS_SELECTOR, limit=0)
|
||||
|
||||
self.click_if_visible(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.is_element_in_an_iframe(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.switch_to_frame_of_element(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.hover_on_element(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.hover_and_click(hover_selector, click_selector,
|
||||
hover_by=By.CSS_SELECTOR, click_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.hover_and_double_click(hover_selector, click_selector,
|
||||
hover_by=By.CSS_SELECTOR, click_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.select_option_by_text(dropdown_selector, option,
|
||||
dropdown_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.select_option_by_index(dropdown_selector, option,
|
||||
dropdown_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.select_option_by_value(dropdown_selector, option,
|
||||
dropdown_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.execute_script(script)
|
||||
|
||||
self.execute_async_script(script, timeout=settings.EXTREME_TIMEOUT)
|
||||
|
||||
self.safe_execute_script(script)
|
||||
|
||||
self.set_window_size(width, height)
|
||||
|
||||
self.maximize_window()
|
||||
|
||||
self.add_css_link(css_link)
|
||||
self.switch_to_frame(frame, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.add_js_link(js_link)
|
||||
self.switch_to_default_content()
|
||||
|
||||
self.add_css_style(css_style)
|
||||
self.open_new_window(switch_to=True)
|
||||
|
||||
self.add_js_code_from_link(js_link)
|
||||
self.switch_to_window(window, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.add_meta_tag(http_equiv=None, content=None)
|
||||
self.switch_to_default_window()
|
||||
|
||||
self.get_new_driver(browser=None, headless=None, servername=None, port=None,
|
||||
proxy=None, switch_to=True, cap_file=None)
|
||||
|
||||
self.switch_to_driver(driver)
|
||||
|
||||
self.switch_to_default_driver()
|
||||
|
||||
self.save_screenshot(name, folder=None)
|
||||
|
||||
self.wait_for_ready_state_complete(timeout=settings.EXTREME_TIMEOUT)
|
||||
|
||||
self.wait_for_angularjs(timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.activate_jquery()
|
||||
|
||||
self.create_tour(name=None, theme=None)
|
||||
|
||||
self.create_shepherd_tour(name=None, theme=None)
|
||||
|
||||
self.create_bootstrap_tour(name=None)
|
||||
|
||||
self.create_hopscotch_tour(name=None)
|
||||
|
||||
self.create_introjs_tour(name=None)
|
||||
|
||||
self.add_tour_step(message, selector=None, name=None, title=None, theme=None, alignment=None)
|
||||
|
||||
self.play_tour(name=None)
|
||||
|
||||
self.export_tour(name=None, filename="my_tour.js", url=None)
|
||||
|
||||
self.activate_jquery_confirm()
|
||||
|
||||
self.activate_messenger()
|
||||
|
||||
self.post_message(message, duration=None, pause=True, style="info")
|
||||
|
||||
self.post_success_message(message, duration=None, pause=True)
|
||||
|
||||
self.post_error_message(message, duration=None, pause=True)
|
||||
|
||||
self.set_messenger_theme(theme="default", location="default", max_messages="default")
|
||||
|
||||
self.bring_to_front(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.highlight(selector, by=By.CSS_SELECTOR, loops=4, scroll=True)
|
||||
|
|
@ -155,8 +163,6 @@ self.js_click(selector, by=By.CSS_SELECTOR)
|
|||
|
||||
self.jquery_click(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.submit(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.hide_element(selector, by=By.CSS_SELECTOR)
|
||||
|
||||
self.hide_elements(selector, by=By.CSS_SELECTOR)
|
||||
|
|
@ -185,8 +191,6 @@ self.assert_no_404_errors(multithreaded=True)
|
|||
|
||||
self.print_unique_links_with_status_codes()
|
||||
|
||||
self.safe_execute_script(script)
|
||||
|
||||
self.create_folder(folder)
|
||||
|
||||
self.choose_file(selector, file_path, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
|
@ -231,22 +235,47 @@ self.js_update_text(selector, new_value, by=By.CSS_SELECTOR, timeout=settings.LA
|
|||
|
||||
self.jquery_update_text(selector, new_value, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.hover_on_element(selector, by=By.CSS_SELECTOR)
|
||||
########
|
||||
|
||||
self.hover_and_click(hover_selector, click_selector,
|
||||
hover_by=By.CSS_SELECTOR, click_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
self.add_css_link(css_link)
|
||||
|
||||
self.hover_and_double_click(hover_selector, click_selector,
|
||||
hover_by=By.CSS_SELECTOR, click_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
self.add_js_link(js_link)
|
||||
|
||||
self.select_option_by_text(dropdown_selector, option,
|
||||
dropdown_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
self.add_css_style(css_style)
|
||||
|
||||
self.select_option_by_index(dropdown_selector, option,
|
||||
dropdown_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
self.add_js_code_from_link(js_link)
|
||||
|
||||
self.select_option_by_value(dropdown_selector, option,
|
||||
dropdown_by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
self.add_meta_tag(http_equiv=None, content=None)
|
||||
|
||||
########
|
||||
|
||||
self.create_tour(name=None, theme=None)
|
||||
|
||||
self.create_shepherd_tour(name=None, theme=None)
|
||||
|
||||
self.create_bootstrap_tour(name=None)
|
||||
|
||||
self.create_hopscotch_tour(name=None)
|
||||
|
||||
self.create_introjs_tour(name=None)
|
||||
|
||||
self.add_tour_step(message, selector=None, name=None, title=None, theme=None, alignment=None)
|
||||
|
||||
self.play_tour(name=None)
|
||||
|
||||
self.export_tour(name=None, filename="my_tour.js", url=None)
|
||||
|
||||
self.activate_jquery_confirm()
|
||||
|
||||
self.activate_messenger()
|
||||
|
||||
self.post_message(message, duration=None, pause=True, style="info")
|
||||
|
||||
self.post_success_message(message, duration=None, pause=True)
|
||||
|
||||
self.post_error_message(message, duration=None, pause=True)
|
||||
|
||||
self.set_messenger_theme(theme="default", location="default", max_messages="default")
|
||||
|
||||
########
|
||||
|
||||
|
|
@ -262,16 +291,14 @@ self.generate_traffic_chain(pages, loops=1)
|
|||
|
||||
self.wait_for_element_present(selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.get_element(selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.assert_element_present(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
########
|
||||
|
||||
self.wait_for_element_visible(selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.wait_for_element(selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.get_element(selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.assert_element_present(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.find_element(selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.assert_element(selector, by=By.CSS_SELECTOR, timeout=settings.SMALL_TIMEOUT)
|
||||
|
|
@ -296,6 +323,10 @@ self.assert_exact_text(text, selector="html", by=By.CSS_SELECTOR, timeout=settin
|
|||
|
||||
########
|
||||
|
||||
self.wait_for_link_text_present(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.wait_for_partial_link_text_present(link_text, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.wait_for_link_text_visible(link_text, timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.wait_for_link_text(link_text, timeout=settings.LARGE_TIMEOUT)
|
||||
|
|
@ -326,35 +357,16 @@ self.assert_element_not_visible(selector, by=By.CSS_SELECTOR, timeout=settings.S
|
|||
|
||||
########
|
||||
|
||||
self.wait_for_ready_state_complete(timeout=settings.EXTREME_TIMEOUT)
|
||||
|
||||
self.wait_for_and_accept_alert(timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.wait_for_and_dismiss_alert(timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.wait_for_and_switch_to_alert(timeout=settings.LARGE_TIMEOUT)
|
||||
|
||||
self.switch_to_frame(frame, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.switch_to_default_content()
|
||||
|
||||
self.open_new_window(switch_to=True)
|
||||
|
||||
self.switch_to_window(window, timeout=settings.SMALL_TIMEOUT)
|
||||
|
||||
self.switch_to_default_window()
|
||||
########
|
||||
|
||||
self.check_window(name="default", level=0, baseline=False)
|
||||
|
||||
self.save_screenshot(name, folder=None)
|
||||
|
||||
self.get_new_driver(browser=None, headless=None, servername=None, port=None,
|
||||
proxy=None, switch_to=True, cap_file=None)
|
||||
|
||||
self.switch_to_driver(driver)
|
||||
|
||||
self.switch_to_default_driver()
|
||||
|
||||
########
|
||||
|
||||
self.delayed_assert_element(selector, by=By.CSS_SELECTOR, timeout=settings.MINI_TIMEOUT)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue