Rename marker uses to pass options to application factory

- While searching marker definition pytest recursively traverses marker
  discovery to parent nodes if marker not found.

- The `app` marker has the name collision with top parent node, e.g. `app`
  fixture.

- Rename it to ensure the collision doesn't occurs.

Closes #34.

Author: vitalk

pytest_flask/plugin.py

@@ -107,7 +107,7 @@ def test_something(app):
         return
 
     app = request.getfuncargvalue('app')
-    options = request.keywords.get('app', None)
+    options = request.keywords.get('options')
     if options:
         for key, value in options.kwargs.items():
             monkeypatch.setitem(app.config, key.upper(), value)

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):