merge with 1.0

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index a367fb93..8f9025e6 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -31,6 +31,8 @@ def setup_module():
     options = Struct(
         inherited_members = False,
         undoc_members = False,
+        private_members = False,
+        special_members = False,
         show_inheritance = False,
         noindex = False,
         synopsis = '',
@@ -500,6 +502,13 @@ def test_generate():
                            'attribute', 'mdocattr')
     del directive.env.temp_data['autodoc:class']
 
+    # test autodoc_docstring_signature
+    assert_result_contains(
+        '.. py:method:: DocstringSig.meth(FOO, BAR=1) -> BAZ', 'method',
+        'test_autodoc.DocstringSig.meth')
+    assert_result_contains(
+        '   rest of docstring', 'method', 'test_autodoc.DocstringSig.meth')
+
 
 # --- generate fodder ------------
 
@@ -594,3 +603,12 @@ class Outer(object):
 
     # should be documented as an alias
     factory = dict
+
+
+class DocstringSig(object):
+    def meth(self):
+        """meth(FOO, BAR=1) -> BAZ
+First line of docstring
+
+        rest of docstring
+        """