Skip to content

Commit 8a96e11

Browse files
authored
Merge pull request #847 from seleniumbase/update-html-inspector
Improve reliability of the HTML-Inspector and JS-loading code
2 parents bf807a7 + d7a3968 commit 8a96e11

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

seleniumbase/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# seleniumbase package
2-
__version__ = "1.59.1"
2+
__version__ = "1.59.2"

seleniumbase/fixtures/base_case.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3324,15 +3324,24 @@ def inspect_html(self):
33243324
(https://cdnjs.com/libraries/html-inspector)
33253325
Prints the results and also returns them. """
33263326
self.__activate_html_inspector()
3327+
self.wait_for_ready_state_complete()
33273328
script = ("""HTMLInspector.inspect();""")
3328-
self.execute_script(script)
3329+
try:
3330+
self.execute_script(script)
3331+
except Exception:
3332+
# If unable to load the JavaScript, skip inspection and return.
3333+
msg = "(Unable to load HTML-Inspector JS! Inspection Skipped!)"
3334+
print("\n" + msg)
3335+
return(msg)
33293336
time.sleep(0.1)
33303337
browser_logs = []
33313338
try:
33323339
browser_logs = self.driver.get_log('browser')
33333340
except (ValueError, WebDriverException):
33343341
# If unable to get browser logs, skip the assert and return.
3335-
return("(Unable to Inspect HTML! -> Only works on Chrome!)")
3342+
msg = "(Unable to Inspect HTML! -> Only works on Chromium!)"
3343+
print("\n" + msg)
3344+
return(msg)
33363345
messenger_library = "//cdnjs.cloudflare.com/ajax/libs/messenger"
33373346
url = self.get_current_url()
33383347
header = '\n* HTML Inspection Results: %s' % url

seleniumbase/fixtures/js_utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,11 @@ def activate_jquery_confirm(driver):
407407

408408
if not is_jquery_activated(driver):
409409
add_js_link(driver, jquery_js)
410-
wait_for_jquery_active(driver, timeout=0.9)
410+
wait_for_jquery_active(driver, timeout=1.2)
411411
add_css_link(driver, jq_confirm_css)
412412
add_js_link(driver, jq_confirm_js)
413413

414-
for x in range(15):
414+
for x in range(int(settings.MINI_TIMEOUT * 10.0)):
415415
# jQuery-Confirm needs a small amount of time to load & activate.
416416
try:
417417
driver.execute_script("jconfirm")
@@ -430,14 +430,14 @@ def activate_html_inspector(driver):
430430
return
431431
if not is_jquery_activated(driver):
432432
add_js_link(driver, jquery_js)
433+
wait_for_jquery_active(driver, timeout=1.2)
433434
wait_for_ready_state_complete(driver)
434435
wait_for_angularjs(driver)
435-
wait_for_jquery_active(driver, timeout=1.5)
436436
add_js_link(driver, html_inspector_js)
437437
wait_for_ready_state_complete(driver)
438438
wait_for_angularjs(driver)
439439

440-
for x in range(15):
440+
for x in range(int(settings.MINI_TIMEOUT * 10.0)):
441441
# HTML-Inspector needs a small amount of time to load & activate.
442442
try:
443443
driver.execute_script("HTMLInspector")

0 commit comments

Comments
 (0)