diff --git a/test/galaxy_selenium/sizzle.py b/test/galaxy_selenium/sizzle.py index 2fad57e4dfe2..c0adf70aa4be 100644 --- a/test/galaxy_selenium/sizzle.py +++ b/test/galaxy_selenium/sizzle.py @@ -95,12 +95,18 @@ def find_elements_by_sizzle(driver, sizzle_selector): def _inject_sizzle(driver, sizzle_url, timeout): script = """ - var _s = document.createElement("script"); - _s.type = "text/javascript"; - _s.src = "{src}"; - var _h = document.getElementsByTagName("head")[0]; - _h.appendChild(_s); - """.format(src=sizzle_url) + if(typeof(window.$) != "undefined") { + // Just reuse jQuery if it is available, avoids potential amd problems + // that have cropped up with Galaxy for instance. + window.Sizzle = window.$; + } else { + var _s = document.createElement("script"); + _s.type = "text/javascript"; + _s.src = "%s"; + var _h = document.getElementsByTagName("head")[0]; + _h.appendChild(_s); + } + """ % sizzle_url driver.execute_script(script) wait = WebDriverWait(driver, timeout) wait.until(lambda d: _is_sizzle_loaded(d), @@ -121,8 +127,8 @@ def _make_sizzle_string(sizzle_selector): __all__ = ( - "sizzle_selector_clickable", - "sizzle_presence_of_selector", "find_element_by_sizzle", "find_elements_by_sizzle", + "sizzle_selector_clickable", + "sizzle_presence_of_selector", ) diff --git a/test/selenium_tests/test_sizzle_loading.py b/test/selenium_tests/test_sizzle_loading.py new file mode 100644 index 000000000000..022e6fdfb67a --- /dev/null +++ b/test/selenium_tests/test_sizzle_loading.py @@ -0,0 +1,10 @@ +from .framework import SeleniumTestCase +from .framework import selenium_test + + +class SizzleLoadingTestCase(SeleniumTestCase): + + @selenium_test + def test_sizzle_loads(self): + self.home() + self.wait_for_sizzle_selector_clickable("div")