Merge pull request #807 from marshmallow-code/fix_enum

Document Enum as list of values, not string

Author: lafrech

src/apispec/ext/marshmallow/field_converter.py

@@ -509,7 +509,11 @@ def enum2properties(self, field, **kwargs: typing.Any) -> dict:
         ret = {}
         if isinstance(field, marshmallow.fields.Enum):
             ret = self.field2property(field.field)
-            ret["enum"] = field.choices_text
+            if field.by_value is False:
+                choices = (m for m in field.enum.__members__)
+            else:
+                choices = (m.value for m in field.enum)
+            ret["enum"] = [field.field._serialize(v, None, None) for v in choices]
         return ret
 
 

tests/test_ext_marshmallow_field.py

@@ -274,7 +274,7 @@ class MyEnum(Enum):
     field = fields.Enum(MyEnum)
     ret = spec_fixture.openapi.field2property(field)
     assert ret["type"] == "string"
-    assert ret["enum"] == "one, two"
+    assert ret["enum"] == ["one", "two"]
 
 
 @pytest.mark.parametrize("by_value", [fields.Integer, True])
@@ -289,7 +289,7 @@ class MyEnum(Enum):
         assert "type" not in ret
     else:
         assert ret["type"] == "integer"
-    assert ret["enum"] == "1, 2"
+    assert ret["enum"] == [1, 2]
 
 
 def test_field2property_nested_spec_metadatas(spec_fixture):