From 94c177565cee758a0059fb67c55142bb41577b88 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 5 Oct 2018 14:05:54 +0200
Subject: Fix issues with PDF.js path changes

(cherry picked from commit b5b4fda676076b08e04661f51c3ed1659564e30e)
---
 qutebrowser/browser/pdfjs.py          | 3 ++-
 tests/end2end/features/conftest.py    | 2 +-
 tests/unit/browser/test_pdfjs.py      | 5 +----
 tests/unit/browser/test_qutescheme.py | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py
index 706e12fc3..80358d0a1 100644
--- a/qutebrowser/browser/pdfjs.py
+++ b/qutebrowser/browser/pdfjs.py
@@ -54,10 +54,11 @@ def generate_pdfjs_page(filename, url):
         url: The URL being opened.
     """
     if not is_available():
+        pdfjs_dir = os.path.join(standarddir.data(), 'pdfjs')
         return jinja.render('no_pdfjs.html',
                             url=url.toDisplayString(),
                             title="PDF.js not found",
-                            pdfjs_dir=os.path.join(standarddir.data(), 'pdfjs'))
+                            pdfjs_dir=pdfjs_dir)
     html = get_pdfjs_res('web/viewer.html').decode('utf-8')
 
     script = _generate_pdfjs_script(filename)
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 8040d84cc..ca14768ef 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -166,7 +166,7 @@ def clean_open_tabs(quteproc):
 
 
 @bdd.given('pdfjs is available')
-def pdfjs_available():
+def pdfjs_available(data_tmpdir):
     if not pdfjs.is_available():
         pytest.skip("No pdfjs installation found.")
 
diff --git a/tests/unit/browser/test_pdfjs.py b/tests/unit/browser/test_pdfjs.py
index 1f0133d02..e50bfed4e 100644
--- a/tests/unit/browser/test_pdfjs.py
+++ b/tests/unit/browser/test_pdfjs.py
@@ -26,10 +26,7 @@ from qutebrowser.browser import pdfjs
 from qutebrowser.utils import usertypes, utils
 
 
-@pytest.fixture(autouse=True)
-def patch_data_dir(monkeypatch, tmpdir):
-    monkeypatch.setattr(pdfjs.standarddir, 'data',
-                        lambda: str(tmpdir / 'data'))
+pytestmark = [pytest.mark.usefixtures('data_tmpdir')]
 
 
 @pytest.mark.parametrize('available, snippet', [
diff --git a/tests/unit/browser/test_qutescheme.py b/tests/unit/browser/test_qutescheme.py
index db8f9b29b..64d525367 100644
--- a/tests/unit/browser/test_qutescheme.py
+++ b/tests/unit/browser/test_qutescheme.py
@@ -207,7 +207,7 @@ class TestPDFJSHandler:
         assert (caplog.records[0].message ==
                 'pdfjs resource requested but not found: /no/file.html')
 
-    def test_viewer_page(self):
+    def test_viewer_page(self, data_tmpdir):
         """Load the /web/viewer.html page."""
         _mimetype, data = qutescheme.data_for_url(
             QUrl('qute://pdfjs/web/viewer.html?filename=foobar'))
-- 
cgit v1.2.3-54-g00ecf