Merge pull request #1513 from seleniumbase/fix-masterqa-mode-on-windows

Fix MasterQA Mode on Windows

Author: mdmintz

README.md

@@ -5,7 +5,7 @@
 <meta property="og:image" content="https://seleniumbase.io/cdn/img/mac_sb_logo_5b.png" />
 <link rel="icon" href="https://seleniumbase.io/img/green_logo2.png" />
 
-<p align="center"><a href="https://github.com/seleniumbase/SeleniumBase/"><img src="https://seleniumbase.io/cdn/img/sb_logo_gs3.png" alt="SeleniumBase" title="SeleniumBase" width="450" /></a></p>
+<p align="center"><a href="https://github.com/seleniumbase/SeleniumBase/"><img src="https://seleniumbase.io/cdn/img/sb_banner_2.png" alt="SeleniumBase" title="SeleniumBase" width="480" /></a></p>
 <p align="center"><b>Scale your web app testing with <a href="https://www.selenium.dev/documentation/">Selenium</a>, <a href="https://www.python.org/about/">Python</a>, and <a href="https://docs.pytest.org/en/latest/how-to/usage.html">pytest</a>.</b></p>
 
 <p align="center"><a href="https://pypi.python.org/pypi/seleniumbase" target="_blank"><img src="https://img.shields.io/pypi/v/seleniumbase.svg?color=3399EE" alt="PyPI version" /></a> <a href="https://github.com/seleniumbase/SeleniumBase/releases" target="_blank"><img src="https://img.shields.io/github/v/release/seleniumbase/SeleniumBase.svg?color=22AAEE" alt="GitHub version" /></a> <a href="https://seleniumbase.io"><img src="https://img.shields.io/badge/docs-seleniumbase.io-11BBAA.svg" alt="SeleniumBase Docs" /></a> <a href="https://github.com/seleniumbase/SeleniumBase/actions" target="_blank"><img src="https://github.com/seleniumbase/SeleniumBase/workflows/CI%20build/badge.svg" alt="SeleniumBase GitHub Actions" /></a> <a href="https://gitter.im/seleniumbase/SeleniumBase" target="_blank"><img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt="SeleniumBase" /></a></p>

requirements.txt

@@ -16,7 +16,7 @@ PyYAML>=6.0;python_version>="3.6"
 traitlets>=4.3.3;python_version<"3.7"
 traitlets>=5.4.0;python_version>="3.7"
 certifi>=2021.10.8;python_version<"3.6"
-certifi>=2022.6.15.2;python_version>="3.6"
+certifi>=2022.9.14;python_version>="3.6"
 filelock>=3.2.1;python_version<"3.6"
 filelock>=3.4.1;python_version>="3.6" and python_version<"3.7"
 filelock>=3.8.0;python_version>="3.7"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.4.1"
+__version__ = "4.4.2"

seleniumbase/masterqa/master_qa.py

@@ -89,7 +89,7 @@ def __clear_out_old_logs(
         self, archive_past_runs=True, get_log_folder=False
     ):
         abs_path = os.path.abspath(".")
-        file_path = abs_path + "/%s" % self.LATEST_REPORT_DIR
+        file_path = os.path.join(abs_path, self.LATEST_REPORT_DIR)
         if not os.path.exists(file_path):
             os.makedirs(file_path)
 
@@ -411,9 +411,9 @@ def __process_manual_check_results(self, auto_close_results_page=False):
         self.__add_bad_page_log_file()  # Includes successful results
 
         log_string = self.__clear_out_old_logs(get_log_folder=True)
-        log_folder = log_string.split("/")[-1]
+        log_folder = log_string.split(os.sep)[-1]
         abs_path = os.path.abspath(".")
-        file_path = abs_path + "/%s" % self.ARCHIVE_DIR
+        file_path = os.path.join(abs_path, self.ARCHIVE_DIR)
         log_path = os.path.join(file_path, log_folder)
         web_log_path = "file://%s" % log_path
 
@@ -496,8 +496,8 @@ def __process_manual_check_results(self, auto_close_results_page=False):
             table_view,
         )
         results_file = self.__add_results_page(report_html)
-        archived_results_file = log_path + "/" + self.RESULTS_PAGE
-        shutil.copyfile(results_file, archived_results_file)
+        archived_results_file = os.path.join(log_path, self.RESULTS_PAGE)
+        shutil.copyfile(results_file, os.path.realpath(archived_results_file))
         if self.manual_check_count > 0:
             print(
                 "\n*** The manual test report is located at:\n" + results_file
@@ -509,5 +509,8 @@ def __process_manual_check_results(self, auto_close_results_page=False):
         else:
             # The user can decide when to close the results page
             print("\n*** Close the html report window to continue ***")
-            while len(self.driver.window_handles):
-                time.sleep(0.1)
+            try:
+                while len(self.driver.window_handles):
+                    time.sleep(0.1)
+            except Exception:
+                pass

setup.py

@@ -142,7 +142,7 @@
         'traitlets>=4.3.3;python_version<"3.7"',
         'traitlets>=5.4.0;python_version>="3.7"',
         'certifi>=2021.10.8;python_version<"3.6"',
-        'certifi>=2022.6.15.2;python_version>="3.6"',
+        'certifi>=2022.9.14;python_version>="3.6"',
         'filelock>=3.2.1;python_version<"3.6"',
         'filelock>=3.4.1;python_version>="3.6" and python_version<"3.7"',
         'filelock>=3.8.0;python_version>="3.7"',