update changelog

move test next to existing test, rename
reword / reflow param doc

Author: davidism

CHANGES

@@ -21,7 +21,11 @@ Major release, unreleased
 - ``send_file`` supports Unicode in ``attachment_filename``. (`#2223`_)
 - Pass ``_scheme`` argument from ``url_for`` to ``handle_build_error``.
   (`#2017`_)
+- Add support for ``provide_automatic_options`` in ``add_url_rule`` to disable
+  adding OPTIONS method when the ``view_func`` argument is not a class.
+  (`#1489`_).
 
+.. _#1489: https://github.com/pallets/flask/pull/1489
 .. _#2017: https://github.com/pallets/flask/pull/2017
 .. _#2223: https://github.com/pallets/flask/pull/2223
 
@@ -146,9 +150,6 @@ Released on May 29th 2016, codename Absinthe.
 - ``flask.g`` now has ``pop()`` and ``setdefault`` methods.
 - Turn on autoescape for ``flask.templating.render_template_string`` by default
   (pull request ``#1515``).
-- Added support for `provide_automatic_options` in :meth:`add_url_rule` to
-  turn off automatic OPTIONS when the `view_func` argument is not a class
-  (pull request ``#1489``).
 - ``flask.ext`` is now deprecated (pull request ``#1484``).
 - ``send_from_directory`` now raises BadRequest if the filename is invalid on
   the server OS (pull request ``#1763``).

flask/app.py

@@ -980,8 +980,7 @@ def iter_blueprints(self):
         return iter(self._blueprint_order)
 
     @setupmethod
-    def add_url_rule(self, rule, endpoint=None, view_func=None,
-                     provide_automatic_options=None, **options):
+    def add_url_rule(self, rule, endpoint=None, view_func=None, provide_automatic_options=None, **options):
         """Connects a URL rule.  Works exactly like the :meth:`route`
         decorator.  If a view_func is provided it will be registered with the
         endpoint.
@@ -1021,10 +1020,10 @@ def index():
                          endpoint
         :param view_func: the function to call when serving a request to the
                           provided endpoint
-        :param provide_automatic_options: controls whether ``OPTIONS`` should
-                                          be provided automatically. If this
-                                          is not set, will check attributes on
-                                          the view or list of methods.
+        :param provide_automatic_options: controls whether the ``OPTIONS``
+            method should be added automatically. This can also be controlled
+            by setting the ``view_func.provide_automatic_options = False``
+            before adding the rule.
         :param options: the options to be forwarded to the underlying
                         :class:`~werkzeug.routing.Rule` object.  A change
                         to Werkzeug is handling of method options.  methods

tests/test_basic.py

@@ -50,7 +50,7 @@ def index_put():
     assert sorted(rv.allow) == ['GET', 'HEAD', 'OPTIONS', 'POST', 'PUT']
 
 
-def test_options_handling_disabled():
+def test_provide_automatic_options_attr():
     app = flask.Flask(__name__)
 
     def index():
@@ -70,6 +70,54 @@ def index2():
     assert sorted(rv.allow) == ['OPTIONS']
 
 
+def test_provide_automatic_options_kwarg():
+    app = flask.Flask(__name__)
+
+    def index():
+        return flask.request.method
+
+    def more():
+        return flask.request.method
+
+    app.add_url_rule('/', view_func=index, provide_automatic_options=False)
+    app.add_url_rule(
+        '/more', view_func=more, methods=['GET', 'POST'],
+        provide_automatic_options=False
+    )
+
+    c = app.test_client()
+    assert c.get('/').data == b'GET'
+
+    rv = c.post('/')
+    assert rv.status_code == 405
+    assert sorted(rv.allow) == ['GET', 'HEAD']
+
+    # Older versions of Werkzeug.test.Client don't have an options method
+    if hasattr(c, 'options'):
+        rv = c.options('/')
+    else:
+        rv = c.open('/', method='OPTIONS')
+
+    assert rv.status_code == 405
+
+    rv = c.head('/')
+    assert rv.status_code == 200
+    assert not rv.data  # head truncates
+    assert c.post('/more').data == b'POST'
+    assert c.get('/more').data == b'GET'
+
+    rv = c.delete('/more')
+    assert rv.status_code == 405
+    assert sorted(rv.allow) == ['GET', 'HEAD', 'POST']
+
+    if hasattr(c, 'options'):
+        rv = c.options('/more')
+    else:
+        rv = c.open('/more', method='OPTIONS')
+
+    assert rv.status_code == 405
+
+
 def test_request_dispatching():
     app = flask.Flask(__name__)
 
@@ -1751,44 +1799,3 @@ def run_simple_mock(hostname, port, *args, **kwargs):
     app = flask.Flask(__name__)
     app.config['SERVER_NAME'] = 'pocoo.org:8080'
     app.run(host, port)
-
-
-def test_disable_automatic_options():
-    # Issue 1488: Add support for a kwarg to add_url_rule to disable the auto OPTIONS response
-    app = flask.Flask(__name__)
-
-    def index():
-        return flask.request.method
-
-    def more():
-        return flask.request.method
-
-    app.add_url_rule('/', 'index', index, provide_automatic_options=False)
-    app.add_url_rule('/more', 'more', more, methods=['GET', 'POST'], provide_automatic_options=False)
-
-    c = app.test_client()
-    assert c.get('/').data == b'GET'
-    rv = c.post('/')
-    assert rv.status_code == 405
-    assert sorted(rv.allow) == ['GET', 'HEAD']
-    # Older versions of Werkzeug.test.Client don't have an options method
-    if hasattr(c, 'options'):
-        rv = c.options('/')
-    else:
-        rv = c.open('/', method='OPTIONS')
-    assert rv.status_code == 405
-
-    rv = c.head('/')
-    assert rv.status_code == 200
-    assert not rv.data  # head truncates
-    assert c.post('/more').data == b'POST'
-    assert c.get('/more').data == b'GET'
-    rv = c.delete('/more')
-    assert rv.status_code == 405
-    assert sorted(rv.allow) == ['GET', 'HEAD', 'POST']
-    # Older versions of Werkzeug.test.Client don't have an options method
-    if hasattr(c, 'options'):
-        rv = c.options('/more')
-    else:
-        rv = c.open('/more', method='OPTIONS')
-    assert rv.status_code == 405