Merge pull request #309 from seleniumbase/update-reports

Update test reports

Author: mdmintz

seleniumbase/config/proxy_list.py

@@ -19,8 +19,7 @@
 """
 
 PROXY_LIST = {
-    "example1": "159.122.164.163:8080",  # (Example) - set your own proxy here
-    "example2": "158.69.138.8:1080",  # (Example) - set your own proxy here
+    "example1": "158.69.138.8:1080",  # (Example) - set your own proxy here
     "proxy1": None,
     "proxy2": None,
     "proxy3": None,

seleniumbase/core/log_helper.py

@@ -7,15 +7,17 @@
 from seleniumbase.config import settings
 
 
-def log_screenshot(test_logpath, driver, screenshot=None):
+def log_screenshot(test_logpath, driver, screenshot=None, get=False):
     screenshot_name = settings.SCREENSHOT_NAME
     screenshot_path = "%s/%s" % (test_logpath, screenshot_name)
     try:
         if not screenshot:
             element = driver.find_element_by_tag_name('body')
-            screenshot = element.screenshot_as_png
+            screenshot = element.screenshot_as_base64
         with open(screenshot_path, "wb") as file:
             file.write(screenshot)
+        if get:
+            return screenshot
     except Exception:
         try:
             driver.get_screenshot_as_file(screenshot_path)

seleniumbase/core/report_helper.py

@@ -6,11 +6,22 @@
 from seleniumbase.config import settings
 from seleniumbase.core.style_sheet import style
 from seleniumbase.fixtures import page_actions
+from seleniumbase import drivers
 
 LATEST_REPORT_DIR = settings.LATEST_REPORT_DIR
 ARCHIVE_DIR = settings.REPORT_ARCHIVE_DIR
 HTML_REPORT = settings.HTML_REPORT
 RESULTS_TABLE = settings.RESULTS_TABLE
+DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
+PLATFORM = sys.platform
+LOCAL_CHROMEDRIVER = None
+LOCAL_GECKODRIVER = None
+if "darwin" in PLATFORM or "linux" in PLATFORM:
+    LOCAL_CHROMEDRIVER = DRIVER_DIR + '/chromedriver'
+    LOCAL_GECKODRIVER = DRIVER_DIR + '/geckodriver'
+elif "win32" in PLATFORM or "win64" in PLATFORM or "x64" in PLATFORM:
+    LOCAL_CHROMEDRIVER = DRIVER_DIR + '/chromedriver.exe'
+    LOCAL_GECKODRIVER = DRIVER_DIR + '/geckodriver.exe'
 
 
 def get_timestamp():
@@ -35,8 +46,9 @@ def process_successes(test, test_count, duration):
 def process_failures(test, test_count, browser_type, duration):
     bad_page_image = "failure_%s.png" % test_count
     bad_page_data = "failure_%s.txt" % test_count
-    page_actions.save_screenshot(
-        test.driver, bad_page_image, folder=LATEST_REPORT_DIR)
+    screenshot_path = "%s/%s" % (LATEST_REPORT_DIR, bad_page_image)
+    with open(screenshot_path, "wb") as file:
+        file.write(test._last_page_screenshot)
     page_actions.save_test_failure_data(
         test.driver, bad_page_data, browser_type, folder=LATEST_REPORT_DIR)
     exc_info = '(Unknown Failure)'
@@ -54,7 +66,7 @@ def process_failures(test, test_count, browser_type, duration):
             "FAILED!",
             bad_page_data,
             bad_page_image,
-            test.driver.current_url,
+            test._last_page_url,
             test.browser,
             get_timestamp()[:-3],
             duration,
@@ -222,10 +234,25 @@ def build_report(report_log_path, page_results_list,
         "\n* Files saved for this report are located at:\n" + report_log_path)
     print("")
     if show_report:
+        browser = None
+        profile = webdriver.FirefoxProfile()
+        profile.set_preference("app.update.auto", False)
+        profile.set_preference("app.update.enabled", False)
+        profile.set_preference("browser.privatebrowsing.autostart", True)
         if browser_type == 'firefox':
-            browser = webdriver.Firefox()
+            if LOCAL_GECKODRIVER and os.path.exists(LOCAL_GECKODRIVER):
+                browser = webdriver.Firefox(
+                    firefox_profile=profile, executable_path=LOCAL_GECKODRIVER)
+            else:
+                browser = webdriver.Firefox(firefox_profile=profile)
         else:
-            browser = webdriver.Chrome()
+            chrome_options = webdriver.ChromeOptions()
+            chrome_options.add_argument("--disable-infobars")
+            if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
+                browser = webdriver.Chrome(
+                    executable_path=LOCAL_CHROMEDRIVER, options=chrome_options)
+            else:
+                browser = webdriver.Chrome(options=chrome_options)
         browser.get("file://%s" % archived_results_file)
         print("\n*** Close the html report window to continue. ***")
         while len(browser.window_handles):

seleniumbase/fixtures/base_case.py

@@ -3158,7 +3158,10 @@ def __set_last_page_screenshot(self):
         if not self.__last_page_screenshot:
             try:
                 element = self.driver.find_element_by_tag_name('body')
-                self.__last_page_screenshot = element.screenshot_as_base64
+                if self.is_pytest:
+                    self.__last_page_screenshot = element.screenshot_as_base64
+                else:
+                    self.__last_page_screenshot = element.screenshot_as_png
             except Exception:
                 pass
 
@@ -3407,5 +3410,11 @@ def tearDown(self):
                     test_logpath,
                     self.driver,
                     self.__last_page_screenshot)
+            if self.report_on:
+                self._last_page_screenshot = self.__last_page_screenshot
+                try:
+                    self._last_page_url = self.get_current_url()
+                except Exception:
+                    self._last_page_url = "(Error: Unknown URL)"
             # Finally close all open browser windows
             self.__quit_all_drivers()

seleniumbase/fixtures/page_actions.py

@@ -424,7 +424,10 @@ def save_screenshot(driver, name, folder=None):
         with open(screenshot_path, "wb") as file:
             file.write(element_png)
     except Exception:
-        driver.get_screenshot_as_file(screenshot_path)
+        if driver:
+            driver.get_screenshot_as_file(screenshot_path)
+        else:
+            pass
 
 
 def _get_last_page(driver):

seleniumbase/plugins/base_plugin.py

@@ -105,6 +105,7 @@ def beforeTest(self, test):
         test.test.env = self.options.environment  # Add a shortened version
         test.test.data = self.options.data
         test.test.args = self.options
+        test.test.report_on = self.report_on
         self.test_count += 1
         self.start_time = float(time.time())
 

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.22.5',
+    version='1.22.6',
     description='Reliable Browser Automation & Testing Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',