Merge pull request #304 from seleniumbase/small-fixes

Small Fixes

Author: mdmintz

examples/raw_parameter_script.py

@@ -37,6 +37,7 @@
     b.log_path = "latest_logs/"
     b.archive_logs = False
     b.disable_csp = False
+    b.visual_baseline = False
     b.save_screenshot_after_test = False
     b.timeout_multiplier = None
     b.with_db_reporting = False

seleniumbase/config/proxy_list.py

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

seleniumbase/core/log_helper.py

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

seleniumbase/fixtures/base_case.py

@@ -26,7 +26,6 @@ def test_anything(self):
 import logging
 import math
 import os
-import pytest
 import re
 import sys
 import time
@@ -74,6 +73,7 @@ def __init__(self, *args, **kwargs):
         self.env = None  # Add a shortened version of self.environment
         self.__last_url_of_delayed_assert = "data:,"
         self.__last_page_load_url = "data:,"
+        self.__last_page_screenshot = None
         self.__delayed_assert_count = 0
         self.__delayed_assert_failures = []
         # Requires self._* instead of self.__* for external class use
@@ -3154,6 +3154,14 @@ def setUp(self, masterqa_mode=False):
                                           disable_csp=self.disable_csp)
         self._default_driver = self.driver
 
+    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
+            except Exception:
+                pass
+
     def __insert_test_result(self, state, err):
         data_payload = TestcaseDataPayload()
         data_payload.runtime = int(time.time() * 1000) - self.case_start_time
@@ -3176,13 +3184,21 @@ def __insert_test_result(self, state, err):
 
     def __add_pytest_html_extra(self):
         try:
-            pytest_html = pytest.config.pluginmanager.getplugin('html')
-            if self.with_selenium and pytest_html:
-                driver = self.driver
-                extra_url = pytest_html.extras.url(driver.current_url)
-                screenshot = driver.get_screenshot_as_base64()
-                extra_image = pytest_html.extras.image(screenshot,
-                                                       name='Screenshot')
+            if self.with_selenium:
+                if not self.__last_page_screenshot:
+                    self.__set_last_page_screenshot()
+                extra_url = {}
+                extra_url['name'] = 'URL'
+                extra_url['format'] = 'url'
+                extra_url['content'] = self.get_current_url()
+                extra_url['mime_type'] = None
+                extra_url['extension'] = None
+                extra_image = {}
+                extra_image['name'] = 'Screenshot'
+                extra_image['format'] = 'image'
+                extra_image['content'] = self.__last_page_screenshot
+                extra_image['mime_type'] = 'image/png'
+                extra_image['extension'] = 'png'
                 self._html_report_extra.append(extra_url)
                 self._html_report_extra.append(extra_image)
         except Exception:
@@ -3273,7 +3289,12 @@ def tearDown(self):
                             os.makedirs(test_logpath)
                         except Exception:
                             pass  # Only reachable during multi-threaded runs
-                    log_helper.log_screenshot(test_logpath, self.driver)
+                    if not self.__last_page_screenshot:
+                        self.__set_last_page_screenshot()
+                    log_helper.log_screenshot(
+                        test_logpath,
+                        self.driver,
+                        self.__last_page_screenshot)
                     self.__add_pytest_html_extra()
                 if self.with_testing_base and has_exception:
                     test_logpath = self.log_path + "/" + test_id
@@ -3286,14 +3307,23 @@ def tearDown(self):
                             not self.with_basic_test_info) and (
                             not self.with_page_source)):
                         # Log everything if nothing specified (if testing_base)
-                        log_helper.log_screenshot(test_logpath, self.driver)
+                        if not self.__last_page_screenshot:
+                            self.__set_last_page_screenshot()
+                        log_helper.log_screenshot(
+                            test_logpath,
+                            self.driver,
+                            self.__last_page_screenshot)
                         log_helper.log_test_failure_data(
                             self, test_logpath, self.driver, self.browser)
                         log_helper.log_page_source(test_logpath, self.driver)
                     else:
                         if self.with_screen_shots:
+                            if not self.__last_page_screenshot:
+                                self.__set_last_page_screenshot()
                             log_helper.log_screenshot(
-                                test_logpath, self.driver)
+                                test_logpath,
+                                self.driver,
+                                self.__last_page_screenshot)
                         if self.with_basic_test_info:
                             log_helper.log_test_failure_data(
                                 self, test_logpath, self.driver, self.browser)
@@ -3354,7 +3384,12 @@ def tearDown(self):
                 log_helper.log_test_failure_data(
                     self, test_logpath, self.driver, self.browser)
                 if len(self._drivers_list) > 0:
-                    log_helper.log_screenshot(test_logpath, self.driver)
+                    if not self.__last_page_screenshot:
+                        self.__set_last_page_screenshot()
+                    log_helper.log_screenshot(
+                        test_logpath,
+                        self.driver,
+                        self.__last_page_screenshot)
                     log_helper.log_page_source(test_logpath, self.driver)
             elif self.save_screenshot_after_test:
                 test_id = "%s.%s.%s" % (self.__class__.__module__,
@@ -3366,6 +3401,11 @@ def tearDown(self):
                         os.makedirs(test_logpath)
                     except Exception:
                         pass  # Only reachable during multi-threaded runs
-                log_helper.log_screenshot(test_logpath, self.driver)
+                if not self.__last_page_screenshot:
+                    self.__set_last_page_screenshot()
+                log_helper.log_screenshot(
+                    test_logpath,
+                    self.driver,
+                    self.__last_page_screenshot)
             # Finally close all open browser windows
             self.__quit_all_drivers()

setup.py

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