Fix splinter_screenshot_encoding not being passed properly

pytest-dev · May 29, 2018 · 32e6ba9 · 32e6ba9
1 parent a83cb59
commit 32e6ba9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.8.6
+-----
+
+- Fix screenshots not being taken when used with xdist (youtux)
+
 1.8.5
 -----
 
@@ -15,7 +20,7 @@ Changelog
 1.8.2
 -----
 
-- Fixed missing `switch_to` method (some selenium `expected_conditions` are broken without 
+- Fixed missing `switch_to` method (some selenium `expected_conditions` are broken without
   it, see `#93 <https://github.com/pytest-dev/pytest-splinter/pull/93>`_)
 
 1.8.1

diff --git a/pytest_splinter/__init__.py b/pytest_splinter/__init__.py
@@ -1,2 +1,2 @@
 """pytest-splinter package."""
-__version__ = '1.8.5'
+__version__ = '1.8.6'
diff --git a/pytest_splinter/plugin.py b/pytest_splinter/plugin.py
@@ -350,7 +350,8 @@ def _take_screenshot(
         session_tmpdir,
         splinter_screenshot_dir,
         splinter_screenshot_getter_html,
-        splinter_screenshot_getter_png
+        splinter_screenshot_getter_png,
+        splinter_screenshot_encoding,
 ):
     """Capture a screenshot as .png and .html.
 
@@ -397,7 +398,7 @@ def _take_screenshot(
                             {
                                 'file_name': screenshot_html_file_name,
                                 'content': html_fd.read(),
-                                'encoding': splinter_screenshot_encoding
+                                'encoding': splinter_screenshot_encoding,
                             }]
                     })
     except Exception as e:  # NOQA
@@ -412,7 +413,8 @@ def _browser_screenshot_session(
         splinter_screenshot_dir,
         splinter_make_screenshot_on_failure,
         splinter_screenshot_getter_html,
-        splinter_screenshot_getter_png
+        splinter_screenshot_getter_png,
+        splinter_screenshot_encoding,
 ):
     """Make browser screenshot on test failure."""
     yield
@@ -444,6 +446,7 @@ def _browser_screenshot_session(
                 splinter_screenshot_dir=splinter_screenshot_dir,
                 splinter_screenshot_getter_html=splinter_screenshot_getter_html,
                 splinter_screenshot_getter_png=splinter_screenshot_getter_png,
+                splinter_screenshot_encoding=splinter_screenshot_encoding,
             )
 
 
@@ -524,6 +527,7 @@ def _take_screenshot_on_failure():
                         splinter_screenshot_dir=splinter_screenshot_dir,
                         splinter_screenshot_getter_html=splinter_screenshot_getter_html,
                         splinter_screenshot_getter_png=splinter_screenshot_getter_png,
+                        splinter_screenshot_encoding=splinter_screenshot_encoding,
                     )
             request.addfinalizer(_take_screenshot_on_failure)
 

diff --git a/requirements-testing.txt b/requirements-testing.txt
@@ -4,4 +4,5 @@ pytest-localserver
 pylama
 pylama_pylint
 astroid>=1.4.5
-selenium<3
+selenium<3
+splinter<=0.7.5