From 40a32a8e11078aa5b33c64d5f02a0b3a792b0511 Mon Sep 17 00:00:00 2001 From: Yuval Yogev Date: Thu, 6 Feb 2020 19:32:36 +0200 Subject: [PATCH 1/3] Support pytest >= 4 --- capybara/pytest_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/capybara/pytest_plugin.py b/capybara/pytest_plugin.py index 7dae559..8bea718 100644 --- a/capybara/pytest_plugin.py +++ b/capybara/pytest_plugin.py @@ -5,10 +5,10 @@ def pytest_runtest_setup(item): - if item.get_marker("js"): + if item.get_closest_marker("js"): capybara.current_driver = capybara.javascript_driver - driver = item.get_marker("driver") + driver = item.get_closest_marker("driver") if driver: assert len(driver.args) == 1, "exactly one driver must be specified" capybara.current_driver = driver.args[0] From a1d3e6e148b0b988facbc1341afe288a916432b0 Mon Sep 17 00:00:00 2001 From: Yuval Yogev Date: Thu, 6 Feb 2020 19:35:28 +0200 Subject: [PATCH 2/3] Update pytest_plugin.py --- capybara/tests/pytest_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capybara/tests/pytest_plugin.py b/capybara/tests/pytest_plugin.py index ff08c56..7b5a2a3 100644 --- a/capybara/tests/pytest_plugin.py +++ b/capybara/tests/pytest_plugin.py @@ -17,7 +17,7 @@ def pytest_pycollect_makeitem(collector, name, obj): @pytest.hookimpl(tryfirst=True) def pytest_runtest_setup(item): # See if this test ``requires`` any special driver features. - requires = item.get_marker("requires") + requires = item.get_closest_marker("requires") if requires is not None: driver = item.getparent(Driver).obj From d543962f18291ceebba26426219c23d2d092112c Mon Sep 17 00:00:00 2001 From: Yuval Yogev Date: Thu, 6 Feb 2020 19:45:55 +0200 Subject: [PATCH 3/3] Pytest 4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3dc3a4c..af8f136 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ "flaky", "flask", "py", - "pytest ~= 3.0, != 3.3.*, < 3.7", + "pytest >= 4.0", "werkzeug"] if sys.version_info < (3, 3): driver_verification_tests_require.append("mock")