Backport PR #1677: Fixes selenium tests

jupyter · Oct 3, 2022 · d84e49c · d84e49c
1 parent 66fa5b2
commit d84e49c
Show file tree

Hide file tree

Showing 6 changed files with 314 additions and 314 deletions.
diff --git a/nbgrader/tests/nbextensions/formgrade_utils.py b/nbgrader/tests/nbextensions/formgrade_utils.py
@@ -31,23 +31,23 @@ def _check_url(browser, port, url):
 
 def _check_breadcrumbs(browser, *breadcrumbs):
     # check that breadcrumbs are correct
-    elements = browser.find_elements_by_css_selector(".breadcrumb li")
+    elements = browser.find_elements(By.CSS_SELECTOR, ".breadcrumb li")
     assert tuple([e.text for e in elements]) == breadcrumbs
 
     # check that the active breadcrumb is correct
-    element = browser.find_element_by_css_selector(".breadcrumb li.active")
+    element = browser.find_element(By.CSS_SELECTOR, ".breadcrumb li.active")
     assert element.text == breadcrumbs[-1]
 
 
 def _click_link(browser, link_text, partial=False):
     if partial:
         WebDriverWait(browser, 10).until(
             EC.presence_of_element_located((By.PARTIAL_LINK_TEXT, link_text)))
-        element = browser.find_element_by_partial_link_text(link_text)
+        element = browser.find_element(By.PARTIAL_LINK_TEXT, link_text)
     else:
         WebDriverWait(browser, 10).until(
             EC.presence_of_element_located((By.LINK_TEXT, link_text)))
-        element = browser.find_element_by_link_text(link_text)
+        element = browser.find_element(By.LINK_TEXT, link_text)
     element.click()
 
 
@@ -165,7 +165,7 @@ def _wait_for_formgrader(browser, port, url, retries=5):
 
 
 def _click_element(browser, name):
-    browser.find_element_by_css_selector(name).click()
+    browser.find_element(By.CSS_SELECTOR, name).click()
 
 
 def _focus_body(browser, num_tries=5):
@@ -185,57 +185,57 @@ def _focus_body(browser, num_tries=5):
 def _send_keys_to_body(browser, *keys):
     _wait_for_tag(browser, "body")
     _focus_body(browser)
-    body = browser.find_element_by_tag_name("body")
+    body = browser.find_element(By.TAG_NAME, "body")
     body.send_keys(*keys)
 
 
 def _get_next_arrow(browser):
-    return browser.find_element_by_css_selector(".next a")
+    return browser.find_element(By.CSS_SELECTOR, ".next a")
 
 
 def _get_comment_box(browser, index):
     def comment_is_present(browser):
-        comments = browser.find_elements_by_css_selector(".comment")
+        comments = browser.find_elements(By.CSS_SELECTOR, ".comment")
         if len(comments) <= index:
             return False
         return True
 
     WebDriverWait(browser, 10).until(comment_is_present)
-    return browser.find_elements_by_css_selector(".comment")[index]
+    return browser.find_elements(By.CSS_SELECTOR, ".comment")[index]
 
 
 def _get_score_box(browser, index):
     def score_is_present(browser):
-        scores = browser.find_elements_by_css_selector(".score")
+        scores = browser.find_elements(By.CSS_SELECTOR, ".score")
         if len(scores) <= index:
             return False
         return True
 
     WebDriverWait(browser, 10).until(score_is_present)
-    return browser.find_elements_by_css_selector(".score")[index]
+    return browser.find_elements(By.CSS_SELECTOR, ".score")[index]
 
 
 def _get_extra_credit_box(browser, index):
     def extra_credit_is_present(browser):
-        extra_credits = browser.find_elements_by_css_selector(".extra-credit")
+        extra_credits = browser.find_elements(By.CSS_SELECTOR, ".extra-credit")
         if len(extra_credits) <= index:
             return False
         return True
 
     WebDriverWait(browser, 10).until(extra_credit_is_present)
-    return browser.find_elements_by_css_selector(".extra-credit")[index]
+    return browser.find_elements(By.CSS_SELECTOR, ".extra-credit")[index]
 
 
 def _save_comment(browser, index):
     _send_keys_to_body(browser, Keys.ESCAPE)
-    glyph = browser.find_elements_by_css_selector(".comment-saved")[index]
+    glyph = browser.find_elements(By.CSS_SELECTOR, ".comment-saved")[index]
     WebDriverWait(browser, 10).until(lambda browser: glyph.is_displayed())
     WebDriverWait(browser, 10).until(lambda browser: not glyph.is_displayed())
 
 
 def _save_score(browser, index):
     _send_keys_to_body(browser, Keys.ESCAPE)
-    glyph = browser.find_elements_by_css_selector(".score-saved")[index]
+    glyph = browser.find_elements(By.CSS_SELECTOR, ".score-saved")[index]
     WebDriverWait(browser, 10).until(lambda browser: glyph.is_displayed())
     WebDriverWait(browser, 10).until(lambda browser: not glyph.is_displayed())
 
@@ -247,7 +247,7 @@ def _get_needs_manual_grade(browser, name):
 
 def _flag(browser):
     _send_keys_to_body(browser, Keys.SHIFT, Keys.CONTROL, "f")
-    message = browser.find_element_by_id("statusmessage")
+    message = browser.find_element(By.ID, "statusmessage")
     WebDriverWait(browser, 10).until(lambda browser: message.is_displayed())
     WebDriverWait(browser, 10).until(lambda browser: not message.is_displayed())
     return browser.execute_script("return $('#statusmessage').text();")
@@ -278,7 +278,7 @@ def _load_formgrade(browser, port, gradebook):
 
 def _child_exists(elem, selector):
     try:
-        elem.find_element_by_css_selector(selector)
+        elem.find_element(By.CSS_SELECTOR, selector)
     except NoSuchElementException:
         return False
     else: