Merge pull request #84 from nicoddemus/fix-warnings

Fix pytest warnings

Author: nicoddemus

docs/changelog.rst

@@ -7,6 +7,8 @@ Changelog
 Next Release
 ------------
 
+- ``pytest-flask`` now requires ``pytest>=3.6`` (`#84`_).
+
 - Add new ``--live-server-port`` option to select the port the live server will use (`#82`_).
   Thanks `@RazerM`_ for the PR.
 
@@ -16,10 +18,13 @@ Next Release
   ``--no-live-server-clean-stop`` in the command-line (`#49`_).
   Thanks `@jadkik`_ for the PR.
 
+- Internal fixes silence pytest warnings, more visible now with ``pytest-3.8.0`` (`#84`_).
+
 .. _@jadkik: https://github.com/jadkik
 .. _@RazerM: https://github.com/RazerM
 .. _#49: https://github.com/pytest-dev/pytest-flask/issues/49
 .. _#82: https://github.com/pytest-dev/pytest-flask/pull/82
+.. _#84: https://github.com/pytest-dev/pytest-flask/pull/84
 
 
 0.11.0 (compared to 0.10.0)

pytest_flask/fixtures.py

@@ -177,21 +177,25 @@ def mimetype(request):
     return request.param
 
 
+def _make_accept_header(mimetype):
+    return [('Accept', mimetype)]
+
+
 @pytest.fixture
 def accept_mimetype(mimetype):
-    return [('Accept', mimetype)]
+    return _make_accept_header(mimetype)
 
 
 @pytest.fixture
 def accept_json(request):
-    return accept_mimetype('application/json')
+    return _make_accept_header('application/json')
 
 
 @pytest.fixture
 def accept_jsonp():
-    return accept_mimetype('application/json-p')
+    return _make_accept_header('application/json-p')
 
 
 @pytest.fixture(params=['*', '*/*'])
 def accept_any(request):
-    return accept_mimetype(request.param)
+    return _make_accept_header(request.param)

pytest_flask/plugin.py

@@ -108,8 +108,7 @@ def test_something(app):
         return
 
     app = getfixturevalue(request, 'app')
-    options = request.keywords.get('options')
-    if options is not None:
+    for options in request.node.iter_markers('options'):
         for key, value in options.kwargs.items():
             monkeypatch.setitem(app.config, key.upper(), value)
 

requirements/main.txt

@@ -1,2 +1,3 @@
+pytest>=3.6
 Flask
-Werkzeug>=0.7
+Werkzeug>=0.7