[deps] Upgraded selenium

(cherry picked from commit f950d57)

Author: Aryamanz29

requirements-test.txt

@@ -1,3 +1,3 @@
 # For testing Dependency loaders
 openwisp_controller @ https://github.com/openwisp/openwisp-controller/tarball/master
-selenium~=3.141.0
+selenium~=4.9.1

tests/test_project/tests/test_selenium.py

@@ -222,7 +222,7 @@ def test_addition_of_transition_effect(self):
         transition = 'none 0s ease 0s'
         # none because transition has been set to none during tests
         self.login()
-        menu = self.web_driver.find_element_by_id('menu')
+        menu = self.web_driver.find_element(By.ID, 'menu')
         main_content = self._get_main_content()
         menu_toggle = self._get_menu_toggle()
         self.assertEqual(menu.value_of_css_property('transition'), transition)
@@ -485,7 +485,7 @@ def test_shelf_filter(self):
                 EC.visibility_of_element_located((By.CSS_SELECTOR, '#site-name'))
             )
             self.assertEqual(self.check_exists_by_id('changelist-filter-clear'), True)
-            paginator = self.web_driver.find_element_by_css_selector('.paginator')
+            paginator = self.web_driver.find_element(By.CSS_SELECTOR, '.paginator')
             self.assertEqual(paginator.get_attribute('innerText'), '2 shelfs')
 
         with self.subTest('Test clear filter button'):
@@ -494,7 +494,7 @@ def test_shelf_filter(self):
             WebDriverWait(self.web_driver, 2).until(
                 EC.visibility_of_element_located((By.CSS_SELECTOR, '#site-name'))
             )
-            paginator = self.web_driver.find_element_by_css_selector('.paginator')
+            paginator = self.web_driver.find_element(By.CSS_SELECTOR, '.paginator')
             self.assertEqual(paginator.get_attribute('innerText'), '4 shelfs')
 
         with self.subTest('Test multiple filters'):
@@ -512,7 +512,7 @@ def test_shelf_filter(self):
             WebDriverWait(self.web_driver, 2).until(
                 EC.visibility_of_element_located((By.CSS_SELECTOR, '#site-name'))
             )
-            paginator = self.web_driver.find_element_by_css_selector('.paginator')
+            paginator = self.web_driver.find_element(By.CSS_SELECTOR, '.paginator')
             self.assertEqual(paginator.get_attribute('innerText'), '0 shelfs')
 
     def test_book_filter(self):
@@ -548,7 +548,7 @@ def test_book_filter(self):
             selected_option = self._get_filter_selected_option('name')
             self.assertNotEqual(old_value, selected_option.get_attribute('innerText'))
             self.assertEqual(selected_option.get_attribute('innerText'), 'horror book')
-            paginator = self.web_driver.find_element_by_css_selector('.paginator')
+            paginator = self.web_driver.find_element(By.CSS_SELECTOR, '.paginator')
             self.assertEqual(paginator.get_attribute('innerText'), '1 book')
 
 
@@ -584,65 +584,66 @@ def test_input_filters(self):
             input_field.send_keys('Horror')
             self._get_filter_button().click()
             # Horror shelf is present
-            self.web_driver.find_element_by_xpath(horror_result_xpath)
+            self.web_driver.find_element(By.XPATH, horror_result_xpath)
             with self.assertRaises(NoSuchElementException):
                 # Factual shelf is absent
-                self.web_driver.find_element_by_xpath(factual_result_xpath)
+                self.web_driver.find_element(By.XPATH, factual_result_xpath)
             # Both shelves should be present after clearing filter
-            self.web_driver.find_element_by_css_selector('.field-clear').click()
-            self.web_driver.find_element_by_xpath(horror_result_xpath)
-            self.web_driver.find_element_by_xpath(factual_result_xpath)
+            self.web_driver.find_element(By.CSS_SELECTOR, '.field-clear').click()
+            self.web_driver.find_element(By.XPATH, horror_result_xpath)
+            self.web_driver.find_element(By.XPATH, factual_result_xpath)
 
         with self.subTest('Test InputFilter'):
             self.open(url)
             input_field = self._get_input_filter()
             input_field.send_keys('HORROR')
             self._get_filter_button().click()
             # Horror shelf is present
-            self.web_driver.find_element_by_xpath(horror_result_xpath)
+            self.web_driver.find_element(By.XPATH, horror_result_xpath)
             with self.assertRaises(NoSuchElementException):
                 # Factual shelf is absent
-                self.web_driver.find_element_by_xpath(factual_result_xpath)
+                self.web_driver.find_element(By.XPATH, factual_result_xpath)
             # Both shelves should be present after clearing filter
-            self.web_driver.find_element_by_css_selector('.field-clear').click()
-            self.web_driver.find_element_by_xpath(horror_result_xpath)
-            self.web_driver.find_element_by_xpath(factual_result_xpath)
+            self.web_driver.find_element(By.CSS_SELECTOR, '.field-clear').click()
+            self.web_driver.find_element(By.XPATH, horror_result_xpath)
+            self.web_driver.find_element(By.XPATH, factual_result_xpath)
 
         with self.subTest('Test InputFilter: UUID'):
             self.open(url)
-            input_field = self.web_driver.find_element_by_css_selector(
-                'input[name=id__exact]'
+            input_field = self.web_driver.find_element(
+                By.CSS_SELECTOR, 'input[name=id__exact]'
             )
             input_field.send_keys(str(horror_shelf.id))
             self._get_filter_button().click()
             # Horror shelf is present
-            self.web_driver.find_element_by_xpath(horror_result_xpath)
+            self.web_driver.find_element(By.XPATH, horror_result_xpath)
             with self.assertRaises(NoSuchElementException):
                 # Factual shelf is absent
-                self.web_driver.find_element_by_xpath(factual_result_xpath)
+                self.web_driver.find_element(By.XPATH, factual_result_xpath)
             # Both shelves should be present after clearing filter
-            self.web_driver.find_element_by_css_selector('.field-clear').click()
-            self.web_driver.find_element_by_xpath(horror_result_xpath)
-            self.web_driver.find_element_by_xpath(factual_result_xpath)
+            self.web_driver.find_element(By.CSS_SELECTOR, '.field-clear').click()
+            self.web_driver.find_element(By.XPATH, horror_result_xpath)
+            self.web_driver.find_element(By.XPATH, factual_result_xpath)
 
         with self.subTest('Test InputFilter: Related field'):
             admin_xpath = f'//*[@id="result_list"]/tbody/tr/th/a[contains(text(), "{self.admin.username}")]'
             user_xpath = f'//*[@id="result_list"]/tbody/tr/th/a[contains(text(), "{user.username}")]'
             self.open(reverse('admin:auth_user_changelist'))
-            input_field = self.web_driver.find_element_by_xpath(
-                '//*[@id="ow-changelist-filter"]/div[1]/div/div/div[2]/div[1]/form/input'
+            input_field = self.web_driver.find_element(
+                By.XPATH,
+                '//*[@id="ow-changelist-filter"]/div[1]/div/div/div[2]/div[1]/form/input',
             )
             input_field.send_keys(str(horror_shelf.id))
             self._get_filter_button().click()
             # Admin user is present
-            self.web_driver.find_element_by_xpath(admin_xpath)
+            self.web_driver.find_element(By.XPATH, admin_xpath)
             with self.assertRaises(NoSuchElementException):
                 # User is absent
-                self.web_driver.find_element_by_xpath(user_xpath)
+                self.web_driver.find_element(By.XPATH, user_xpath)
             # Both users should be present after clearing filter
-            self.web_driver.find_element_by_css_selector('.field-clear').click()
-            self.web_driver.find_element_by_xpath(admin_xpath)
-            self.web_driver.find_element_by_xpath(user_xpath)
+            self.web_driver.find_element(By.CSS_SELECTOR, '.field-clear').click()
+            self.web_driver.find_element(By.XPATH, admin_xpath)
+            self.web_driver.find_element(By.XPATH, user_xpath)
 
 
 class TestDashboardCharts(SeleniumTestMixin, CreateMixin, StaticLiveServerTestCase):
@@ -671,7 +672,7 @@ def test_pie_chart_zero_annotation(self):
         except TimeoutException:
             self.fail('Failed to find annotation text element in the chart')
         else:
-            annotation_text = self.web_driver.find_element_by_css_selector(
-                '.operator-project-distribution .annotation-text tspan'
+            annotation_text = self.web_driver.find_element(
+                By.CSS_SELECTOR, '.operator-project-distribution .annotation-text tspan'
             )
             self.assertEqual(annotation_text.text, '0')

tests/test_project/tests/utils.py

@@ -105,9 +105,9 @@ def login(self, username=None, password=None, driver=None):
         url = self.live_server_url + self.config['login_url']
         driver.get(url)
         if 'admin/login' in driver.current_url:
-            driver.find_element_by_name('username').send_keys(username)
-            driver.find_element_by_name('password').send_keys(password)
-            driver.find_element_by_css_selector('input[type="submit"]').click()
+            driver.find_element(By.NAME, 'username').send_keys(username)
+            driver.find_element(By.NAME, 'password').send_keys(password)
+            driver.find_element(By.XPATH, '//input[@type="submit"]').click()
 
     def logout(self):
         account_button = self._get_account_button()
@@ -116,80 +116,80 @@ def logout(self):
         logout_link.click()
 
     def _get_menu_toggle(self):
-        return self.web_driver.find_element_by_css_selector('.menu-toggle')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.menu-toggle')
 
     def _get_menu(self):
-        return self.web_driver.find_element_by_id('menu')
+        return self.web_driver.find_element(By.ID, 'menu')
 
     def _get_nav(self):
-        return self.web_driver.find_element_by_css_selector('#menu .nav')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '#menu .nav')
 
     def _get_hamburger(self):
-        return self.web_driver.find_element_by_css_selector('.hamburger')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.hamburger')
 
     def _get_main_content(self):
-        return self.web_driver.find_element_by_id('main-content')
+        return self.web_driver.find_element(By.ID, 'main-content')
 
     def _get_menu_home_item_label(self):
-        return self.web_driver.find_element_by_css_selector(
-            'a.menu-item:nth-child(1) > span:nth-child(2)'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, 'a.menu-item:nth-child(1) > span:nth-child(2)'
         )
 
     def _get_logo(self):
-        return self.web_driver.find_element_by_id('site-name')
+        return self.web_driver.find_element(By.ID, 'site-name')
 
     def _get_container(self):
-        return self.web_driver.find_element_by_id('container')
+        return self.web_driver.find_element(By.ID, 'container')
 
     def _get_test_mg_head(self):
-        return self.web_driver.find_element_by_css_selector('#mg-control-32')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '#mg-control-32')
 
     def _get_test_mg_icon(self):
-        return self.web_driver.find_element_by_css_selector('.auth')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.auth')
 
     def _get_test_mg_label(self):
-        return self.web_driver.find_element_by_css_selector(
-            '#mg-control-32 > div:nth-child(1) > span:nth-child(2)'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, '#mg-control-32 > div:nth-child(1) > span:nth-child(2)'
         )
 
     def _get_active_mg(self):
-        return self.web_driver.find_element_by_css_selector('.active-mg .mg-dropdown')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.active-mg .mg-dropdown')
 
     def _get_active_mg_head(self):
-        return self.web_driver.find_element_by_css_selector('.active-mg .mg-head')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.active-mg .mg-head')
 
     def _get_test_mg_dropdown(self):
-        return self.web_driver.find_element_by_css_selector('#mg-dropdown-32')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '#mg-dropdown-32')
 
     def _get_test_mg_dropdown_label(self):
-        return self.web_driver.find_element_by_css_selector(
-            '#mg-dropdown-32 > div:nth-child(1)'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, '#mg-dropdown-32 > div:nth-child(1)'
         )
 
     def _get_account_button(self):
-        return self.web_driver.find_element_by_css_selector('.account-button')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.account-button')
 
     def _get_account_dropdown(self):
-        return self.web_driver.find_element_by_css_selector('.account-menu')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.account-menu')
 
     def _get_account_button_username(self):
-        return self.web_driver.find_element_by_css_selector('.account-button strong')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.account-button strong')
 
     def _get_account_dropdown_username(self):
-        return self.web_driver.find_element_by_css_selector('.account-menu-username')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.account-menu-username')
 
     def _get_logout_link(self):
-        return self.web_driver.find_element_by_css_selector('.menu-link')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.menu-link')
 
     def _get_menu_backdrop(self):
-        return self.web_driver.find_element_by_css_selector('.menu-backdrop')
+        return self.web_driver.find_element(By.CSS_SELECTOR, '.menu-backdrop')
 
     def _get_simple_input_filter(self):
-        return self.web_driver.find_element_by_css_selector('input[name=shelf]')
+        return self.web_driver.find_element(By.CSS_SELECTOR, 'input[name=shelf]')
 
     def _get_input_filter(self):
-        return self.web_driver.find_element_by_css_selector(
-            'input[name=books_type__exact]'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, 'input[name=books_type__exact]'
         )
 
     def _open_menu(self):
@@ -216,52 +216,52 @@ def _close_menu(self):
             hamburger.click()
 
     def _get_filter(self):
-        return self.web_driver.find_element_by_id('ow-changelist-filter')
+        return self.web_driver.find_element(By.ID, 'ow-changelist-filter')
 
     def _get_filter_button(self):
-        return self.web_driver.find_element_by_id('ow-apply-filter')
+        return self.web_driver.find_element(By.ID, 'ow-apply-filter')
 
     def _get_clear_button(self):
-        return self.web_driver.find_element_by_id('changelist-filter-clear')
+        return self.web_driver.find_element(By.ID, 'changelist-filter-clear')
 
     def check_exists_by_id(self, id):
         try:
-            self.web_driver.find_element_by_id(id)
+            self.web_driver.find_element(By.ID, id)
         except NoSuchElementException:
             return False
         return True
 
     def check_exists_by_xpath(self, xpath):
         try:
-            self.web_driver.find_element_by_xpath(xpath)
+            self.web_driver.find_element(By.XPATH, xpath)
         except NoSuchElementException:
             return False
         return True
 
     def check_exists_by_css_selector(self, selector):
         try:
-            self.web_driver.find_element_by_css_selector(selector)
+            self.web_driver.find_element(By.CSS_SELECTOR, selector)
         except NoSuchElementException:
             return False
         return True
 
     def _get_filter_selected_option(self, filter_class):
-        return self.web_driver.find_element_by_css_selector(
-            f'.{filter_class} .selected-option'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, f'.{filter_class} .selected-option'
         )
 
     def _get_filter_dropdown(self, filter_class):
-        return self.web_driver.find_element_by_css_selector(
-            f'.{filter_class} .filter-options'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, f'.{filter_class} .filter-options'
         )
 
     def _get_filter_title(self, filter_class):
-        return self.web_driver.find_element_by_css_selector(
-            f'.{filter_class} .filter-title'
+        return self.web_driver.find_element(
+            By.CSS_SELECTOR, f'.{filter_class} .filter-title'
         )
 
     def _get_filter_anchor(self, query):
-        return self.web_driver.find_element_by_xpath(f'//a[@href="?{query}"]')
+        return self.web_driver.find_element(By.XPATH, f'//a[@href="?{query}"]')
 
     def wait_for_dropdown(self, filter_class):
         WebDriverWait(self.web_driver, 2).until(