fix: backport update deprecated selenium methods

Author: fdintino

nested_admin/tests/admin_widgets/tests.py

@@ -100,7 +100,7 @@ def check_datetime(self, indexes):
             now_link_xpath = "following-sibling::*[1]/a[1]"
         date_el.clear()
         time_el.clear()
-        self.click(date_el.find_element_by_xpath(now_link_xpath))
+        self.click(date_el.find_element(By.XPATH, now_link_xpath))
         if self.has_grappelli:
             selector = '#ui-datepicker-div .ui-state-highlight'
             with self.clickable_selector(selector, timeout=1) as el:
@@ -109,7 +109,7 @@ def check_datetime(self, indexes):
                 self.wait_until_element_is('#ui-datepicker-div', ':not(:visible)',
                     'Datepicker widget did not close')
         time.sleep(0.2)
-        self.click(time_el.find_element_by_xpath(now_link_xpath))
+        self.click(time_el.find_element(By.XPATH, now_link_xpath))
         if self.has_grappelli:
             selector = '#ui-timepicker .ui-state-active'
             with self.clickable_selector(selector, timeout=1) as el:
@@ -136,7 +136,7 @@ def check_m2m(self, indexes):
     def check_fk(self, indexes):
         field = self.get_field('fk1', indexes)
         parent = field.get_property('parentNode').get_property('parentNode')
-        add_related = parent.find_element_by_css_selector('.add-related')
+        add_related = parent.find_element(By.CSS_SELECTOR, '.add-related')
         if self.has_grappelli:
             # Grappelli can be very slow to initialize fk bindings, particularly
             # when run on travis-ci
@@ -166,7 +166,7 @@ def check_gfk_related_lookup(self, indexes):
             ec.element_to_be_clickable((By.CSS_SELECTOR, related_lookup_selector)),
             message="Timeout waiting for related lookup widget on '#%s'" % object_id_field_id)
 
-        lookup_el = self.selenium.find_element_by_css_selector(related_lookup_selector)
+        lookup_el = self.selenium.find_element(By.CSS_SELECTOR, related_lookup_selector)
         lookup_el.click()
         with self.switch_to_popup_window():
             with self.clickable_xpath('//tr//a[text()="Zither"]') as el:
@@ -176,7 +176,7 @@ def check_gfk_related_lookup(self, indexes):
         z_pk = "%s" % WidgetsM2M.objects.get(name='Zither').pk
 
         def element_value_populated(d):
-            el = d.find_element_by_css_selector("#%s" % object_id_field_id)
+            el = d.find_element(By.CSS_SELECTOR, "#%s" % object_id_field_id)
             return el.get_attribute('value')
 
         self.wait_until(
@@ -354,7 +354,7 @@ def test_autocomplete_single_init(self):
         self.load_admin()
         self.add_inline()
         self.add_inline([1])
-        autocomplete_elements = self.selenium.find_elements_by_xpath(
+        autocomplete_elements = self.selenium.find_elements(By.XPATH, 
             '//*[@id="id_widgetsa_set-1-widgetsb_set-0-fk2-autocomplete"]')
         self.assertNotEqual(len(autocomplete_elements), 0,
             "Zero autocomplete fields initialized")
@@ -384,7 +384,7 @@ def test_nested_autocomplete_extra(self):
         self.add_inline([0, [0]])
         self.add_inline([0, 1, [0]])
         select_field = self.get_field('fk3', indexes=[0, 1, [0, 0]])
-        select_parent = select_field.find_element_by_xpath('parent::*')
+        select_parent = select_field.find_element(By.XPATH, 'parent::*')
         select_parent.click()
         select2_is_active = self.selenium.execute_script(
             'return $(".select2-search__field").length > 0')

nested_admin/tests/base.py

@@ -13,6 +13,7 @@
 import django
 from django.conf import settings
 from django.contrib.admin.sites import site as admin_site
+from selenium.webdriver.common.by import By
 
 import six
 from selenosis import AdminSelenosisTestCase
@@ -167,7 +168,7 @@ def save_form(self):
             self.selenium.execute_script(
                 'return django.jQuery("[name=_continue]").length'))
         name_attr = "_continue" if has_continue else "_save"
-        self.click(self.selenium.find_element_by_xpath('//*[@name="%s"]' % name_attr))
+        self.click(self.selenium.find_element(By.XPATH, '//*[@name="%s"]' % name_attr))
         if has_continue:
             self.wait_page_loaded()
             self.initialize_page()
@@ -330,14 +331,14 @@ def get_group(self, indexes=None):
             expr_parts += ["/*[%s][%d]" % (xpath_item(parent_model), parent_item_index + 1)]
         expr_parts += ["/*[@data-inline-model='%s']" % model_name]
         expr = "/%s" % ("/".join(expr_parts))
-        return self.selenium.find_element_by_xpath(expr)
+        return self.selenium.find_element(By.XPATH, expr)
 
     def get_item(self, indexes):
         indexes = self._normalize_indexes(indexes)
         model_name, item_index = indexes.pop()
         indexes.append(model_name)
         group = self.get_group(indexes=indexes)
-        return group.find_element_by_xpath(".//*[%s][%d]" % (xpath_item(model_name), item_index + 1))
+        return group.find_element(By.XPATH, ".//*[%s][%d]" % (xpath_item(model_name), item_index + 1))
 
     def add_inline(self, indexes=None, name=None, slug=None):
         indexes = self._normalize_indexes(indexes, is_group=True)
@@ -397,7 +398,7 @@ def get_form_field_selector(self, attname, indexes=None):
     def get_field(self, attname, indexes=None):
         indexes = self._normalize_indexes(indexes)
         field_selector = self.get_form_field_selector(attname, indexes=indexes)
-        return self.selenium.find_element_by_css_selector(field_selector)
+        return self.selenium.find_element(By.CSS_SELECTOR, field_selector)
 
     def set_field(self, attname, value, indexes=None):
         indexes = self._normalize_indexes(indexes)

nested_admin/tests/drag_drop.py

@@ -3,6 +3,7 @@
 
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.common.by import By
 
 from .utils import (
     xpath_cls, xpath_item, is_integer, Position, Size, ElementRect)
@@ -94,7 +95,7 @@ def source(self):
                     "*[%s]" % xpath_cls("is-sortable"),
                     "*[%s]" % xpath_cls("djn-drag-handler"),
                 ])
-            self._source = source_item.find_element_by_xpath(drag_handler_xpath)
+            self._source = source_item.find_element(By.XPATH, drag_handler_xpath)
         return self._source
 
     @property
@@ -111,7 +112,7 @@ def target(self):
                     'item_pred': xpath_item(),
                     'item_pos': self.to_indexes[-1][1] + 1,
                 }
-            self._target = target_inline_parent.find_element_by_xpath(target_xpath)
+            self._target = target_inline_parent.find_element(By.XPATH, target_xpath)
         return self._target
 
     def initialize_drag(self):
@@ -225,7 +226,7 @@ def _num_preceding_siblings(self, ctx, condition):
         is extraordinarily slow. So we just grab all siblings and iterate
         through the elements in python.
         """
-        siblings = ctx.find_element_by_xpath('parent::*').find_elements_by_xpath('*')
+        siblings = ctx.find_element(By.XPATH, 'parent::*').find_elements(By.XPATH, '*')
         count = 0
         for el in siblings:
             if el.id == ctx.id:
@@ -250,7 +251,7 @@ def is_djn_group(el):
 
     @property
     def current_position(self):
-        placeholder = self.selenium.find_element_by_css_selector(
+        placeholder = self.selenium.find_element(By.CSS_SELECTOR, 
             '.ui-sortable-placeholder')
         pos = []
         ctx = None
@@ -259,9 +260,9 @@ def current_position(self):
             if ctx is None:
                 ctx = placeholder
             else:
-                ctx = ctx.find_element_by_xpath(ancestor_xpath)
+                ctx = ctx.find_element(By.XPATH, ancestor_xpath)
             item_index = self._num_preceding_djn_items(ctx)
-            ctx = ctx.find_element_by_xpath('ancestor::*[%s][1]' % xpath_cls("djn-group"))
+            ctx = ctx.find_element(By.XPATH, 'ancestor::*[%s][1]' % xpath_cls("djn-group"))
             inline_index = self._num_preceding_djn_groups(ctx)
             pos.insert(0, (inline_index, item_index))
         return tuple(pos)

nested_admin/tests/nested_polymorphic/base.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 from django.apps import apps
 from polymorphic.utils import get_base_polymorphic_model
+from selenium.webdriver.common.by import By
 
 from nested_admin.tests.base import BaseNestedAdminTestCase
 from nested_admin.tests.utils import xpath_item, xpath_cls, is_sequence, is_integer, is_str
@@ -153,12 +154,12 @@ def get_item(self, indexes):
         except TypeError:
             group = self.get_group(indexes=group_indexes + [model_id])
         group_id = group.get_attribute('id')
-        djn_items = self.selenium.find_element_by_css_selector(
+        djn_items = self.selenium.find_element(By.CSS_SELECTOR, 
             "#%(id)s > .djn-fieldset > .djn-items, "
             "#%(id)s > .tabular.inline-related > .djn-fieldset > .djn-items, "
             "#%(id)s > .djn-items" % {'id': group_id})
         model_name, item_index = indexes[-1]
-        return djn_items.find_element_by_xpath(
+        return djn_items.find_element(By.XPATH, 
             "./*[%s][%d]" % (xpath_item(), item_index + 1))
 
     def delete_inline(self, indexes):
@@ -204,7 +205,7 @@ def add_inline(self, indexes=None, model=None, **kwargs):
 
         add_selector = "#%s .djn-add-item a.djn-add-handler.djn-model-%s" % (
             ctx_id, base_model_identifier)
-        add_els = self.selenium.find_elements_by_css_selector(add_selector)
+        add_els = self.selenium.find_elements(By.CSS_SELECTOR, add_selector)
         self.assertNotEqual(len(add_els), 0,
             "No inline add handlers found for %s" % (error_desc))
         self.click(add_els[0])
@@ -222,12 +223,12 @@ def add_inline(self, indexes=None, model=None, **kwargs):
             'return $(arguments[0]).closest(".djn-group")[0]', add_els[0])
         group_id = group_el.get_attribute('id')
 
-        items_el = self.selenium.find_element_by_css_selector(
+        items_el = self.selenium.find_element(By.CSS_SELECTOR, 
             '#%(id)s > .djn-fieldset > .djn-items, '
             "#%(id)s > .tabular.inline-related > .djn-fieldset > .djn-items, "
             '#%(id)s > .djn-items' % {'id': group_id})
 
-        num_inlines = len(items_el.find_elements_by_xpath(
+        num_inlines = len(items_el.find_elements(By.XPATH, 
             './*[%s and not(%s)]' % (xpath_item(), xpath_cls('djn-empty-form'))))
 
         new_index = num_inlines - 1
@@ -247,7 +248,7 @@ def remove_inline(self, indexes):
     def get_num_inlines(self, indexes=None):
         group = self.get_group(indexes=indexes)
         group_id = group.get_attribute('id')
-        djn_items = self.selenium.find_element_by_css_selector(
+        djn_items = self.selenium.find_element(By.CSS_SELECTOR, 
             "#%(id)s > .djn-fieldset > .djn-items, "
             "#%(id)s > .tabular.inline-related > .djn-fieldset > .djn-items, "
             "#%(id)s > .djn-items" % {'id': group_id})
@@ -266,4 +267,4 @@ def get_group(self, indexes=None):
         expr_parts += ["/*[@data-inline-model='%s' and %s]"
             % (model_name, xpath_cls('djn-group'))]
         expr = "/%s" % ("/".join(expr_parts))
-        return self.selenium.find_element_by_xpath(expr)
+        return self.selenium.find_element(By.XPATH, expr)

nested_admin/tests/nested_polymorphic/test_polymorphic_mixed_nesting/tests.py

@@ -1,5 +1,6 @@
 from unittest import SkipTest
 from django.test import TestCase
+from selenium.webdriver.common.by import By
 
 from .models import (
     Block, BlockMarkdown, BlockRadioGroup, BlockRadioButton,
@@ -39,7 +40,7 @@ def test_polymorphic_child_formset_rendering(self):
 
         inline_ids = [
             el.get_attribute('id') for el in
-            self.selenium.find_elements_by_css_selector(
+            self.selenium.find_elements(By.CSS_SELECTOR, 
                 '.djn-group:not([id*="-empty-"]')]
 
         expected_inline_ids = [
@@ -53,7 +54,7 @@ def test_polymorphic_child_formset_rendering(self):
 
         inline_ids = [
             el.get_attribute('id') for el in
-            self.selenium.find_elements_by_css_selector(
+            self.selenium.find_elements(By.CSS_SELECTOR, 
                 '.djn-group:not([id*="-empty-"]')]
 
         assert "surveystep_set-0-block_set-0-blockradiobutton_set-group" not in inline_ids, (

nested_admin/tests/one_deep/tests.py

@@ -137,7 +137,7 @@ def _block_out_arg(self, selector):
         Generate the --block-out argument passed to pixelmatch that excludes
         an element from the diff
         """
-        el = self.selenium.find_element_by_css_selector(selector)
+        el = self.selenium.find_element(By.CSS_SELECTOR, selector)
         return ['--block-out', "%(x)s,%(y)s,%(w)s,%(h)s" % {
             'x': el.location['x'],
             'y': el.location['y'],
@@ -150,7 +150,7 @@ def exclude_from_screenshots(self, imgs, exclude=None):
         exclude = exclude or []
         rects = []
         for selector in exclude:
-            el = self.selenium.find_element_by_css_selector(selector)
+            el = self.selenium.find_element(By.CSS_SELECTOR, selector)
             x0, y0 = el.location['x'], el.location['y']
             w, h = el.size['width'], el.size['height']
             x1, y1 = x0 + w, y0 + h

nested_admin/tests/two_deep/tests.py

@@ -832,7 +832,7 @@ def test_add_item_inline_label_update(self):
         with self.clickable_xpath('//input[@name="section_set-0-item_set-0-name"]') as el:
             el.send_keys("Test 2")
 
-        inline_label = self.get_item([0, 1]).find_element_by_class_name('inline_label')
+        inline_label = self.get_item([0, 1]).find_element(By.XPATH, by_class_name('inline_label')
         self.assertEqual(inline_label.text, '#2')
 
     def test_upload_file(self):