Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

1.7.4
-----

- use tmpdir_factory to get session scoped tmpdir (RonnyPfannschmidt, bubenkoff)


1.7.3
-----

Expand Down
2 changes: 1 addition & 1 deletion pytest_splinter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""pytest-splinter package."""
__version__ = '1.7.3'
__version__ = '1.7.4'
7 changes: 3 additions & 4 deletions pytest_splinter/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
import pytest # pragma: no cover
import splinter # pragma: no cover
from _pytest import junitxml
from _pytest.tmpdir import tmpdir

from selenium.webdriver.support import wait
from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
from selenium.common.exceptions import WebDriverException

from .webdriver_patches import patch_webdriver # pragma: no cover
from .splinter_patches import patch_webdriverelement # pragma: no cover
from .decorators import with_fixtures


LOGGER = logging.getLogger(__name__)
Expand Down Expand Up @@ -264,9 +262,10 @@ def browser_patches():


@pytest.fixture(scope='session')
def session_tmpdir(request):
def session_tmpdir(request, tmpdir_factory):
"""pytest tmpdir which is session-scoped."""
return with_fixtures(tmpdir)(request)
from _pytest.tmpdir import tmpdir
return tmpdir(request, tmpdir_factory)


@pytest.fixture(scope='session')
Expand Down