Merge pull request #507 from seleniumbase/update-reports-deps-and-settings-parsing

Update reports, custom settings parsing, and "soupsieve"

Author: mdmintz

requirements.txt

@@ -24,7 +24,8 @@ pytest-ordering>=0.6
 pytest-rerunfailures>=8.0
 pytest-xdist>=1.31.0
 parameterized>=0.7.1
-soupsieve==1.9.5
+soupsieve==1.9.5;python_version<"3.5"
+soupsieve==2.0;python_version>="3.5"
 beautifulsoup4==4.8.2
 atomicwrites==1.3.0
 portalocker==1.5.2

seleniumbase/core/report_helper.py

@@ -19,9 +19,11 @@
 if "darwin" in PLATFORM or "linux" in PLATFORM:
     LOCAL_CHROMEDRIVER = DRIVER_DIR + '/chromedriver'
     LOCAL_GECKODRIVER = DRIVER_DIR + '/geckodriver'
+    LOCAL_EDGEDRIVER = DRIVER_DIR + '/msedgedriver'
 elif "win32" in PLATFORM or "win64" in PLATFORM or "x64" in PLATFORM:
     LOCAL_CHROMEDRIVER = DRIVER_DIR + '/chromedriver.exe'
     LOCAL_GECKODRIVER = DRIVER_DIR + '/geckodriver.exe'
+    LOCAL_EDGEDRIVER = DRIVER_DIR + '/msedgedriver.exe'
 
 
 def get_timestamp():
@@ -245,8 +247,22 @@ def build_report(report_log_path, page_results_list,
                     firefox_profile=profile, executable_path=LOCAL_GECKODRIVER)
             else:
                 browser = webdriver.Firefox(firefox_profile=profile)
+        elif browser_type == 'edge':
+            edge_options = webdriver.ChromeOptions()
+            edge_options.add_experimental_option(
+                "excludeSwitches", ["enable-automation", "enable-logging"])
+            edge_options.add_argument("--test-type")
+            edge_options.add_argument("--disable-infobars")
+            if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
+                browser = webdriver.Chrome(
+                    executable_path=LOCAL_EDGEDRIVER, options=edge_options)
+            else:
+                browser = webdriver.Chrome(options=edge_options)
         else:
             chrome_options = webdriver.ChromeOptions()
+            chrome_options.add_experimental_option(
+                "excludeSwitches", ["enable-automation", "enable-logging"])
+            chrome_options.add_argument("--test-type")
             chrome_options.add_argument("--disable-infobars")
             if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
                 browser = webdriver.Chrome(

seleniumbase/core/settings_parser.py

@@ -124,6 +124,8 @@ def set_settings(settings_file):
             settings.TOTP_KEY = override_settings[key]
         elif key == "DB_HOST":
             settings.DB_HOST = override_settings[key]
+        elif key == "DB_PORT":
+            settings.DB_PORT = override_settings[key]
         elif key == "DB_USERNAME":
             settings.DB_USERNAME = override_settings[key]
         elif key == "DB_PASSWORD":

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.35.7',
+    version='1.35.8',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -106,7 +106,8 @@
         'pytest-rerunfailures>=8.0',
         'pytest-xdist>=1.31.0',
         'parameterized>=0.7.1',
-        'soupsieve==1.9.5',
+        'soupsieve==1.9.5;python_version<"3.5"',
+        'soupsieve==2.0;python_version>="3.5"',
         'beautifulsoup4==4.8.2',
         'atomicwrites==1.3.0',
         'portalocker==1.5.2',