Refactoring

Author: mdmintz

seleniumbase/fixtures/base_case.py

@@ -5770,13 +5770,13 @@ def show_file_choosers(self):
                 css_selector, timeout=settings.MINI_TIMEOUT
             )
         except Exception:
-            pass
+            time.sleep(0.14)
         if self.__needs_minimum_wait():
             time.sleep(0.05)
         try:
             self.show_elements(css_selector)
         except Exception:
-            pass
+            time.sleep(0.16)
         css_selector = re.escape(css_selector)  # Add "\\" to special chars
         css_selector = self.__escape_quotes_if_needed(css_selector)
         script = (
@@ -7880,7 +7880,7 @@ def set_messenger_theme(
         Themes: ["flat", "future", "block", "air", "ice"]
         Locations: ["top_left", "top_center", "top_right",
                     "bottom_left", "bottom_center", "bottom_right"]
-        max_messages is the limit of concurrent messages to display.
+        max_messages: The limit of concurrent messages to display.
         """
         self.__check_scope()
         self.__check_browser()
@@ -8070,7 +8070,6 @@ def generate_referral_chain(self, pages):
                 "Exception: At least two website pages required for chaining!"
             )
         for page in pages:
-            # Find out if any of the web pages are invalid before continuing
             if not page_utils.is_valid_url(page):
                 raise Exception(
                     "Exception: Website page {%s} is not a valid URL!" % page
@@ -12003,8 +12002,8 @@ def __click_with_offset(
                 element_rect = element.rect
                 left_offset = element_rect["width"] / 2
                 top_offset = element_rect["height"] / 2
-                x = -left_offset + (x or 0)
-                y = -top_offset + (y or 0)
+                x = -left_offset + (math.ceil(float(x)) or 0)
+                y = -top_offset + (math.ceil(float(y)) or 0)
             elif selenium4_or_newer and center:
                 pass
             elif not selenium4_or_newer and not center:

seleniumbase/fixtures/css_to_xpath.py

@@ -1,6 +1,4 @@
-"""
-Convert CSS selectors into XPath selectors
-"""
+"""Convert CSS selectors into XPath selectors"""
 from cssselect.xpath import GenericTranslator
 
 
@@ -12,9 +10,7 @@ class ConvertibleToCssTranslator(GenericTranslator):
     """
 
     def css_to_xpath(self, css, prefix="//"):
-        return super(ConvertibleToCssTranslator, self).css_to_xpath(
-            css, prefix
-        )
+        return super().css_to_xpath(css, prefix)
 
     def xpath_attrib_equals(self, xpath, name, value):
         xpath.add_condition("%s=%s" % (name, self.xpath_literal(value)))

seleniumbase/masterqa/master_qa.py

@@ -1,6 +1,4 @@
-"""
-This tool allows testers to quickly verify pages while assisted by automation.
-"""
+"""Manually verify pages quickly while assisted by automation."""
 import os
 import shutil
 import sys
@@ -17,7 +15,7 @@ class MasterQA(BaseCase):
     def setUp(self):
         self.check_count = 0
         self.auto_close_results_page = False
-        super(MasterQA, self).setUp(masterqa_mode=True)
+        super().setUp(masterqa_mode=True)
         self.LATEST_REPORT_DIR = settings.LATEST_REPORT_DIR
         self.ARCHIVE_DIR = settings.REPORT_ARCHIVE_DIR
         self.RESULTS_PAGE = settings.HTML_REPORT
@@ -67,7 +65,7 @@ def tearDown(self):
         if self.__has_exception():
             self.__add_failure(sys.exc_info()[1])
         self.__process_manual_check_results(self.auto_close_results_page)
-        super(MasterQA, self).tearDown()
+        super().tearDown()
 
     ####################
 

seleniumbase/plugins/base_plugin.py

@@ -1,7 +1,4 @@
-"""
-This is the Nosetest plugin for setting base configuration and logging.
-"""
-
+"""The Nosetest plugin for setting base configuration and logging."""
 import ast
 import sys
 import time
@@ -37,11 +34,10 @@ class Base(Plugin):
                     Only use this when running tests locally, as this will
                     pause the test run until the report window is closed.
     """
-
     name = "testing_base"  # Usage: --with-testing_base  (Enabled by default)
 
     def options(self, parser, env):
-        super(Base, self).options(parser, env=env)
+        super().options(parser, env=env)
         parser.add_option(
             "--env",
             action="store",
@@ -189,7 +185,7 @@ def options(self, parser, env):
             )
 
     def configure(self, options, conf):
-        super(Base, self).configure(options, conf)
+        super().configure(options, conf)
         self.enabled = True  # Used if test class inherits BaseCase
         self.options = options
         self.report_on = options.report

seleniumbase/plugins/basic_test_info.py

@@ -1,14 +1,4 @@
-"""
-The plugin for saving basic test info to the logs for Selenium tests.
-The created file will be saved in the default logs folder (in .../logs)
-Data to be saved includes:
-* Last page url
-* Browser
-* Server
-* Error
-* Traceback
-"""
-
+"""The plugin for saving basic test info for Selenium tests."""
 import os
 import codecs
 import time
@@ -18,21 +8,15 @@
 
 
 class BasicTestInfo(Plugin):
-    """
-    This plugin will capture basic info when a test fails or
-    raises an error. It will store that basic test info in
-    the default logs or in the file specified by the user.
-    """
-
+    """This plugin captures basic info when a test fails or raises an error."""
     name = "basic_test_info"  # Usage: --with-basic_test_info
-
     logfile_name = settings.BASIC_INFO_NAME
 
     def options(self, parser, env):
-        super(BasicTestInfo, self).options(parser, env=env)
+        super().options(parser, env=env)
 
     def configure(self, options, conf):
-        super(BasicTestInfo, self).configure(options, conf)
+        super().configure(options, conf)
         if not self.enabled:
             return
         self.options = options

seleniumbase/plugins/db_reporting_plugin.py

@@ -1,7 +1,4 @@
-"""
-This plugin is for recording test results in the Testcase Database.
-"""
-
+"""The plugin for recording test results in the Testcase Database."""
 import getpass
 import time
 import uuid
@@ -16,10 +13,7 @@
 
 
 class DBReporting(Plugin):
-    """
-    This plugin records test results in the Testcase Database.
-    """
-
+    """This plugin records test results in the Testcase Database."""
     name = "db_reporting"  # Usage: --with-db_reporting
 
     def __init__(self):
@@ -33,7 +27,7 @@ def __init__(self):
         self._test = None
 
     def options(self, parser, env):
-        super(DBReporting, self).options(parser, env=env)
+        super().options(parser, env=env)
         parser.add_option(
             "--database_env",
             "--database-env",
@@ -57,7 +51,7 @@ def options(self, parser, env):
         )
 
     def configure(self, options, conf):
-        super(DBReporting, self).configure(options, conf)
+        super().configure(options, conf)
         self.options = options
         self.testcase_manager = TestcaseManager(self.options.database_env)
 

seleniumbase/plugins/page_source.py

@@ -1,7 +1,4 @@
-"""
-The plugin for capturing and storing the page source on errors and failures.
-"""
-
+"""The plugin for capturing & storing the page source on errors & failures."""
 import os
 import codecs
 from nose.plugins import Plugin
@@ -10,20 +7,15 @@
 
 
 class PageSource(Plugin):
-    """
-    This plugin will capture the page source when a test fails
-    or raises an error. It will store the page source in the
-    logs file specified, along with default test information.
-    """
-
+    """Capture the page source when a test fails or raises an error."""
     name = "page_source"  # Usage: --with-page_source
     logfile_name = settings.PAGE_SOURCE_NAME
 
     def options(self, parser, env):
-        super(PageSource, self).options(parser, env=env)
+        super().options(parser, env=env)
 
     def configure(self, options, conf):
-        super(PageSource, self).configure(options, conf)
+        super().configure(options, conf)
         if not self.enabled:
             return
         self.options = options
@@ -49,7 +41,7 @@ def addFailure(self, test, err, capt=None, tbinfo=None):
         try:
             page_source = test.driver.page_source
         except Exception:
-            # Since we can't get the page source from here, skip saving it
+            # Since we can't get the page source from here, don't save it.
             return
         test_logpath = self.options.log_path + "/" + test.id()
         if not os.path.exists(test_logpath):

seleniumbase/plugins/pytest_plugin.py

@@ -1,7 +1,4 @@
-"""
-This is the pytest configuration file for setting test options.
-"""
-
+"""This is the pytest configuration file for setting test options."""
 import colorama
 import os
 import pytest
@@ -2072,11 +2069,11 @@ def sb(request):
 
     class BaseClass(BaseCase):
         def setUp(self):
-            super(BaseClass, self).setUp()
+            super().setUp()
 
         def tearDown(self):
             self.save_teardown_screenshot()
-            super(BaseClass, self).tearDown()
+            super().tearDown()
 
         def base_method(self):
             pass

seleniumbase/plugins/s3_logging_plugin.py

@@ -1,7 +1,4 @@
-"""
-The S3 Logging Plugin lets you upload test logs to the S3 bucket specified.
-"""
-
+"""The S3 Plugin for uploading test logs to the S3 bucket specified."""
 import uuid
 import logging
 import os
@@ -11,12 +8,11 @@
 
 class S3Logging(Plugin):
     """The plugin for uploading test logs to the S3 bucket specified."""
-
     name = "s3_logging"  # Usage: --with-s3-logging
 
     def configure(self, options, conf):
         """Get the options."""
-        super(S3Logging, self).configure(options, conf)
+        super().configure(options, conf)
         self.options = options
 
     def afterTest(self, test):

seleniumbase/plugins/screen_shots.py

@@ -1,27 +1,19 @@
-"""
-Contains the screenshot plugin for the selenium tests.
-"""
-
+"""The screenshot plugin for selenium tests that run with nosetests."""
 import os
 from nose.plugins import Plugin
 from seleniumbase.config import settings
 
 
 class ScreenShots(Plugin):
-    """
-    This plugin will take a screenshot when either a test fails
-    or raises an error. It will store that screenshot either in
-    the default logs file or in another file of the user's specification.
-    """
-
+    """This plugin takes a screenshot when a test fails or raises an error."""
     name = "screen_shots"
     logfile_name = settings.SCREENSHOT_NAME
 
     def options(self, parser, env):
-        super(ScreenShots, self).options(parser, env=env)
+        super().options(parser, env=env)
 
     def configure(self, options, conf):
-        super(ScreenShots, self).configure(options, conf)
+        super().configure(options, conf)
         if not self.enabled:
             return
         self.options = options