Merge pull request bepasty#338 from ThomasWaldmann/selenium430-compat-fixes

fix compatibility with selenium >=4.3.0

Author: ThomasWaldmann

src/bepasty/tests/screenshots.py

@@ -71,7 +71,7 @@ def toggle_hamburger(self):
 
         # Toggle the hamburger menu
         try:
-            self.browser.find_element_by_xpath('//button[@class="navbar-toggler"]').click()
+            self.browser.find_element(By.XPATH, '//button[@class="navbar-toggler"]').click()
         except ElementNotInteractableException:
             pass
         time.sleep(.5)
@@ -101,7 +101,7 @@ def login(self):
         self.top_screen_shots("top")
         self.screenshot_seq += 1
 
-        token = self.browser.find_element_by_name("token")
+        token = self.browser.find_element(By.NAME, "token")
         password = "foo"
         # Log in
         token.send_keys(password)
@@ -113,17 +113,17 @@ def login(self):
         self.screenshot_seq += 1
 
         try:
-            self.browser.find_element_by_xpath("//input[@value='Logout']")
+            self.browser.find_element(By.XPATH, "//input[@value='Logout']")
         except NoSuchElementException:
             raise ValueError("Can't log in! Please edit your config, go to the PERMISSIONS setting, "
                              "and add a new secret 'foo' with all permissions.")
 
     def upload_file(self, path):
         # Set the file path
-        fileupload = self.browser.find_element_by_id('fileupload')
+        fileupload = self.browser.find_element(By.ID, 'fileupload')
         fileupload.send_keys(path)
 
-        form = self.browser.find_element_by_xpath('//form[@action="/+upload"]')
+        form = self.browser.find_element(By.XPATH, '//form[@action="/+upload"]')
         form.click()
 
     def upload_view(self):
@@ -160,15 +160,15 @@ def upload_view(self):
             self.screenshot_seq += 1
 
             # Click Abort
-            abort = self.browser.find_element_by_id('fileupload-abort')
+            abort = self.browser.find_element(By.ID, 'fileupload-abort')
             abort.click()
             time.sleep(.5)
 
             # NOTE: Abort Bootbox dialog
             self.screen_shots("abort")
             self.screenshot_seq += 1
 
-            ok = self.browser.find_element_by_class_name('bootbox-accept')
+            ok = self.browser.find_element(By.CLASS_NAME, 'bootbox-accept')
             ok.click()
 
             self.scroll_to_bottom()
@@ -185,7 +185,7 @@ def list_view(self):
 
     def display_view(self):
         self.browser.get(self.url_base + '/+list')
-        list_link = self.browser.find_elements_by_xpath('//tr/td/a')
+        list_link = self.browser.find_elements(By.XPATH, '//tr/td/a')
         list_link[0].click()
 
         # Highlight a line
@@ -195,25 +195,25 @@ def display_view(self):
         self.screen_shots("display")
         self.screenshot_seq += 1
 
-        modify = self.browser.find_element_by_id('modify-btn')
+        modify = self.browser.find_element(By.ID, 'modify-btn')
         modify.click()
         time.sleep(.5)
 
         # NOTE: Modify Bootbox dialog
         self.screen_shots("modify")
         self.screenshot_seq += 1
 
-        modify_cancel = self.browser.find_element_by_class_name('bootbox-cancel')
+        modify_cancel = self.browser.find_element(By.CLASS_NAME, 'bootbox-cancel')
         modify_cancel.click()
         time.sleep(.5)
 
-        lock = self.browser.find_element_by_id('lock-btn')
+        lock = self.browser.find_element(By.ID, 'lock-btn')
         lock.click()
         # NOTE: Display with lock screen
         self.screen_shots("lock")
         self.screenshot_seq += 1
 
-        qr = self.browser.find_element_by_id('qr-btn')
+        qr = self.browser.find_element(By.ID, 'qr-btn')
         qr.click()
         # NOTE: QR code screen
         self.screen_shots("qr")

src/bepasty/tests/test_website.py

@@ -2,6 +2,7 @@
 from selenium.webdriver.chrome.service import Service as ChromeService
 from selenium.webdriver import Chrome
 from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.common.by import By
 from selenium.common.exceptions import (
     NoSuchDriverException, NoSuchElementException
 )
@@ -27,17 +28,17 @@ def setup_class(self):
             service = ChromeService(executable_path="/usr/bin/chromedriver")
             self.browser = Chrome(service=service)
         self.browser.get('http://localhost:5000/')
-        token = self.browser.find_element_by_name("token")
+        token = self.browser.find_element(By.NAME, "token")
         password = "foo"
         # Log in
         token.send_keys(password)
         token.send_keys(Keys.ENTER)
         time.sleep(.1)
         try:
-            self.browser.find_element_by_xpath("//input[@value='Logout']")
+            self.browser.find_element(By.XPATH, "//input[@value='Logout']")
         except NoSuchElementException:
             raise ValueError("Can't log in! Create a user 'foo' with the permissions "
-                             "'read' and 'create' in your PERMISSIONS in the config")
+                             "'read,create,delete' in your PERMISSIONS in the config.")
 
     def teardown_class(self):
         """
@@ -47,12 +48,12 @@ def teardown_class(self):
 
     @property
     def page_body_lowercase(self):
-        return self.browser.find_element_by_tag_name("body").text.lower()
+        return self.browser.find_element(By.TAG_NAME, "body").text.lower()
 
     def test_unit_input_exists(self):
-        unit_input = self.browser.find_element_by_name("maxlife-unit")
+        unit_input = self.browser.find_element(By.NAME, "maxlife-unit")
         assert unit_input is not None
-        value_input = self.browser.find_element_by_name("maxlife-value")
+        value_input = self.browser.find_element(By.NAME, "maxlife-value")
         assert value_input is not None
 
     def fill_form(self):
@@ -62,33 +63,33 @@ def fill_form(self):
         """
         filename = "test.txt"
         text_to_paste = "This is a test"
-        paste_input = self.browser.find_element_by_id("formupload")
+        paste_input = self.browser.find_element(By.ID, "formupload")
         paste_input.send_keys(text_to_paste)
-        filename_input = self.browser.find_element_by_id("filename")
+        filename_input = self.browser.find_element(By.ID, "filename")
         filename_input.send_keys(filename)
-        contenttype_input = self.browser.find_element_by_id("contenttype")
+        contenttype_input = self.browser.find_element(By.ID, "contenttype")
         contenttype_input.send_keys("text/plain")
         contenttype_input.send_keys(Keys.ENTER)
         time.sleep(.2)  # give some time to render the next view
         return filename, text_to_paste
 
     def delete_current_file(self):
-        self.browser.find_element_by_id("del-btn").click()
+        self.browser.find_element(By.ID, "del-btn").click()
         time.sleep(.2)
-        self.browser.find_element_by_class_name("bootbox-accept").click()
+        self.browser.find_element(By.CLASS_NAME, "bootbox-accept").click()
 
     def test_paste_keep_forever(self):
-        self.browser.find_element_by_xpath("//select[@name='maxlife-unit']/option[@value='forever']").click()
-        value_input = self.browser.find_element_by_name("maxlife-value")
+        self.browser.find_element(By.XPATH, "//select[@name='maxlife-unit']/option[@value='forever']").click()
+        value_input = self.browser.find_element(By.NAME, "maxlife-value")
         value_input.clear()
         value_input.send_keys(1)
         self.fill_form()
         assert "max lifetime: forever" in self.page_body_lowercase
         self.delete_current_file()
 
     def test_paste_keep_minutes(self):
-        self.browser.find_element_by_xpath("//select[@name='maxlife-unit']/option[@value='minutes']").click()
-        value_input = self.browser.find_element_by_name("maxlife-value")
+        self.browser.find_element(By.XPATH, "//select[@name='maxlife-unit']/option[@value='minutes']").click()
+        value_input = self.browser.find_element(By.NAME, "maxlife-value")
         value_input.clear()
         value_input.send_keys(1)
         self.fill_form()
@@ -102,18 +103,18 @@ def test_filename_gets_displayed(self):
 
     def test_pasted_text_gets_displayed(self):
         _, pasted_text = self.fill_form()
-        self.browser.find_element_by_id("inline-btn").click()
+        self.browser.find_element(By.ID, "inline-btn").click()
         assert pasted_text.lower() in self.page_body_lowercase
         self.browser.back()
         self.delete_current_file()
 
     @pytest.mark.slow
     def test_file_gets_deleted_after_expiry_time(self):
-        self.browser.find_element_by_xpath("//select[@name='maxlife-unit']/option[@value='minutes']").click()
-        value_input = self.browser.find_element_by_name("maxlife-value")
+        self.browser.find_element(By.XPATH, "//select[@name='maxlife-unit']/option[@value='minutes']").click()
+        value_input = self.browser.find_element(By.NAME, "maxlife-value")
         value_input.clear()
         value_input.send_keys(1)
         self.fill_form()
         time.sleep(61)
-        self.browser.find_element_by_id("inline-btn").click()
+        self.browser.find_element(By.ID, "inline-btn").click()
         assert "not found" in self.page_body_lowercase