Merge pull request #35 from vitalk/rename-marker-used-to-pass-options-to-app

Rename marker used to pass options to app.

Author: vitalk

docs/features.rst

@@ -210,10 +210,10 @@ Markers
 on `what markers are`_ and for notes on `using them`_.
 
 
-``pytest.mark.app`` - pass options to your application config
+``pytest.mark.options`` - pass options to your application config
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. py:function:: pytest.mark.app(**kwargs)
+.. py:function:: pytest.mark.options(**kwargs)
 
    The mark uses to pass options to your application config.
 
@@ -225,7 +225,7 @@ on `what markers are`_ and for notes on `using them`_.
 
    .. code:: python
 
-       @pytest.mark.app(debug=False)
+       @pytest.mark.options(debug=False)
        def test_app(app):
            assert not app.debug, 'Ensure the app not in debug mode'
 

pytest_flask/__init__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"

pytest_flask/plugin.py

@@ -95,10 +95,10 @@ def teardown():
 
 @pytest.fixture(autouse=True)
 def _configure_application(request, monkeypatch):
-    """Use `pytest.mark.app` decorator to pass options to your application
+    """Use `pytest.mark.options` decorator to pass options to your application
     factory::
 
-        @pytest.mark.app(debug=False)
+        @pytest.mark.options(debug=False)
         def test_something(app):
             assert not app.debug, 'the application works not in debug mode!'
 
@@ -107,8 +107,8 @@ def test_something(app):
         return
 
     app = request.getfuncargvalue('app')
-    options = request.keywords.get('app', None)
-    if options:
+    options = request.keywords.get('options')
+    if options is not None:
         for key, value in options.kwargs.items():
             monkeypatch.setitem(app.config, key.upper(), value)
 

setup.py

@@ -21,11 +21,11 @@
 - ``accept_json``, ``accept_jsonp``, ``accept_any`` - accept headers
   suitable to use as parameters in ``client``.
 
-To pass options to your application use the ``pytest.mark.app`` marker:
+To pass options to your application use the ``pytest.mark.options`` marker:
 
 .. code:: python
 
-    @pytest.mark.app(debug=False)
+    @pytest.mark.options(debug=False)
     def test_app(app):
       assert not app.debug, 'Ensure the app not in debug mode'
 

tests/test_live_server.py

@@ -30,6 +30,6 @@ def test_url_for(self, live_server):
     def test_set_application_server_name(self, live_server):
         assert live_server.app.config['SERVER_NAME'] == 'localhost:%d' % live_server.port
 
-    @pytest.mark.app(server_name='example.com:5000')
+    @pytest.mark.options(server_name='example.com:5000')
     def test_rewrite_application_server_name(self, live_server):
         assert live_server.app.config['SERVER_NAME'] == 'example.com:%d' % live_server.port

tests/test_markers.py

@@ -12,14 +12,14 @@ def app():
     return app
 
 
-class TestAppMarker:
+class TestOptionMarker:
 
-    @pytest.mark.app(debug=False)
+    @pytest.mark.options(debug=False)
     def test_not_debug_app(self, app):
         assert not app.debug, 'Ensure the app not in debug mode'
 
-    @pytest.mark.app(foo=42)
-    def test_update_application_config(self, config):
+    @pytest.mark.options(foo=42)
+    def test_update_application_config(self, request, app, config):
         assert config['FOO'] == 42
 
     def test_application_config_teardown(self, config):