Merge pull request #6484 from ericsnekbytes/selenium_test_updates

Selenium test updates

Author: echarles

notebook/tests/selenium/test_dashboard_nav.py

@@ -1,5 +1,7 @@
 import os
 
+from selenium.webdriver.common.by import By
+
 from notebook.utils import url_path_join
 from notebook.tests.selenium.utils import wait_for_selector
 pjoin = os.path.join
@@ -31,9 +33,9 @@ def get_list_items(browser):
 
     return [{
         'link': a.get_attribute('href'),
-        'label': a.find_element_by_class_name('item_name').text,
+        'label': a.find_element(By.CLASS_NAME, 'item_name').text,
         'element': a,
-    } for a in browser.find_elements_by_class_name('item_link')]
+    } for a in browser.find_elements(By.CLASS_NAME, 'item_link')]
 
 def only_dir_links(browser):
     """Return only links that point at other directories in the tree"""

notebook/tests/selenium/test_display_image.py

@@ -3,6 +3,8 @@
 The effect of shape metadata is validated, using Image(retina=True)
 """
 
+from selenium.webdriver.common.by import By
+
 from .utils import wait_for_tag
 
 
@@ -36,7 +38,7 @@ def validate_img(notebook, cell_index, image_fmt, retina):
 
     # Find the image element that was just displayed
     wait_for_tag(notebook.cells[cell_index], "img", single=True)
-    img_element = notebook.cells[cell_index].find_element_by_tag_name("img")
+    img_element = notebook.cells[cell_index].find_element(By.TAG_NAME, "img")
 
     src = img_element.get_attribute("src")
     prefix = src.split(',')[0]

notebook/tests/selenium/test_display_isolation.py

@@ -3,6 +3,9 @@
 An object whose metadata contains an "isolated" tag must be isolated
 from the rest of the document.
 """
+
+from selenium.webdriver.common.by import By
+
 from .utils import wait_for_tag
 
 
@@ -43,16 +46,16 @@ def isolated_html(notebook):
     iframe = wait_for_tag(notebook.browser, "iframe", single=True)
 
     # The non-isolated div will be in the body
-    non_isolated_div = notebook.body.find_element_by_id("non-isolated")
+    non_isolated_div = notebook.body.find_element(By.ID, "non-isolated")
     assert non_isolated_div.value_of_css_property("color") == red
 
     # The non-isolated styling will have affected the output of other cells
-    test_div = notebook.body.find_element_by_id("test")
+    test_div = notebook.body.find_element(By.ID, "test")
     assert test_div.value_of_css_property("color") == red
 
     # The isolated div will be in an iframe, only that element will be blue
     notebook.browser.switch_to.frame(iframe)
-    isolated_div = notebook.browser.find_element_by_id("isolated")
+    isolated_div = notebook.browser.find_element(By.ID, "isolated")
     assert isolated_div.value_of_css_property("color") == blue
     notebook.browser.switch_to.default_content()
     # Clean up the html test cells
@@ -80,13 +83,13 @@ def isolated_svg(notebook):
 
     # The first rectangle will be red
     notebook.browser.switch_to.frame(iframes[0])
-    isolated_svg_1 = notebook.browser.find_element_by_id('r1')
+    isolated_svg_1 = notebook.browser.find_element(By.ID, 'r1')
     assert isolated_svg_1.value_of_css_property("fill") == yellow
     notebook.browser.switch_to.default_content()
 
     # The second rectangle will be black
     notebook.browser.switch_to.frame(iframes[1])
-    isolated_svg_2 = notebook.browser.find_element_by_id('r2')
+    isolated_svg_2 = notebook.browser.find_element(By.ID, 'r2')
     assert isolated_svg_2.value_of_css_property("fill") == black
 
     # Clean up the svg test cells

notebook/tests/selenium/test_dualmode_arrows.py

@@ -1,4 +1,5 @@
 """Tests arrow keys on both command and edit mode"""
+from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 
 def test_dualmode_arrows(notebook):
@@ -76,7 +77,7 @@ def test_dualmode_arrows(notebook):
 
     # Tests in edit mode.
     # First, erase the previous content and then setup the cells to test the keys to move up.
-    [notebook.browser.find_element_by_class_name("fa-cut.fa").click() for i in range(6)]
+    [notebook.browser.find_element(By.CLASS_NAME, "fa-cut.fa").click() for i in range(6)]
     [notebook.body.send_keys("b") for i in range(2)]
     notebook.body.send_keys("a")
     notebook.body.send_keys(Keys.ENTER)

notebook/tests/selenium/test_execute_code.py

@@ -1,3 +1,4 @@
+from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from .utils import shift, cmdtrl
 
@@ -33,7 +34,8 @@ def clear_outputs():
     # Execute cell with toolbar button
     notebook.edit_cell(index=0, content='a=13; print(a)')
     clear_outputs()
-    notebook.browser.find_element_by_css_selector(
+    notebook.browser.find_element(
+        By.CSS_SELECTOR,
         "button[data-jupyter-action='jupyter-notebook:run-cell-and-select-next']").click()
     outputs = notebook.wait_for_cell_output(0)
     assert outputs[0].text == '13'

notebook/tests/selenium/test_interrupt.py

@@ -1,8 +1,11 @@
+from selenium.webdriver.common.by import By
+
 from .utils import wait_for_selector
 
+
 def interrupt_from_menu(notebook):
     # Click interrupt button in kernel menu
-    notebook.browser.find_element_by_id('kernellink').click()
+    notebook.browser.find_element(By.ID, 'kernellink').click()
     wait_for_selector(notebook.browser, '#int_kernel', single=True).click()
 
 def interrupt_from_keyboard(notebook):

notebook/tests/selenium/test_kernel_menu.py

@@ -16,7 +16,7 @@
 def test_cancel_restart_or_shutdown(notebook):
     """Click each of the restart options, then cancel the confirmation dialog"""
     browser = notebook.browser
-    kernel_menu = browser.find_element_by_id('kernellink')
+    kernel_menu = browser.find_element(By.ID, 'kernellink')
 
     for menu_item in restart_selectors + [shutdown_selector]:
         kernel_menu.click()
@@ -30,7 +30,7 @@ def test_cancel_restart_or_shutdown(notebook):
 
 def test_menu_items(notebook):
     browser = notebook.browser
-    kernel_menu = browser.find_element_by_id('kernellink')
+    kernel_menu = browser.find_element(By.ID, 'kernellink')
 
     for menu_item in restart_selectors:
         # Shutdown

notebook/tests/selenium/test_markdown.py

@@ -1,8 +1,11 @@
+from selenium.webdriver.common.by import By
+
 from nbformat.v4 import new_markdown_cell
 
+
 def get_rendered_contents(nb):
     cl = ["text_cell", "render"]
-    rendered_cells = [cell.find_element_by_class_name("text_cell_render") 
+    rendered_cells = [cell.find_element(By.CLASS_NAME, "text_cell_render")
                       for cell in nb.cells 
                       if all([c in cell.get_attribute("class") for c in cl])]
     return [x.get_attribute('innerHTML').strip()

notebook/tests/selenium/test_multiselect.py

@@ -1,5 +1,9 @@
+from selenium.webdriver.common.by import By
+
+
 INITIAL_CELLS = ['print("a")', 'print("b")', 'print("c")']
 
+
 def test_multiselect(prefill_notebook):
     notebook = prefill_notebook(INITIAL_CELLS)
 
@@ -15,7 +19,8 @@ def n_selected_cells():
     assert n_selected_cells() == 1
 
     # Check that only one cell is selected according to CSS classes as well
-    selected_css = notebook.browser.find_elements_by_css_selector(
+    selected_css = notebook.browser.find_elements(
+        By.CSS_SELECTOR,
         '.cell.jupyter-soft-selected, .cell.selected')
     assert len(selected_css) == 1
 

notebook/tests/selenium/test_notifications.py

@@ -2,6 +2,7 @@
 Test the notification area and widgets
 """
 import pytest
+from selenium.webdriver.common.by import By
 
 from .utils import wait_for_selector, wait_for_script_to_return_true
 
@@ -95,7 +96,7 @@ def test_notification(notebook):
 
     assert widget_message(notebook, "test") == "test click", "callback: message is correct"
 
-    notebook.browser.find_element_by_id("notification_test").click()
+    notebook.browser.find_element(By.ID, "notification_test").click()
     wait_for_script_to_return_true(notebook.browser,
                                    'return IPython.notification_area.widget("test")._clicked;')
     wait_for_selector(notebook.browser, "#notification_test", obscures=True)