Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/apispec/ext/marshmallow/openapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def schema2jsonschema(self, schema):
fields = get_fields(schema)
Meta = getattr(schema, "Meta", None)
partial = getattr(schema, "partial", None)
ordered = getattr(schema, "ordered", False)
ordered = getattr(Meta, "ordered", False)

jsonschema = self.fields2jsonschema(fields, partial=partial, ordered=ordered)

Expand Down
16 changes: 16 additions & 0 deletions tests/test_ext_marshmallow_openapi.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pytest
from collections import OrderedDict
from datetime import datetime

from marshmallow import EXCLUDE, fields, INCLUDE, RAISE, Schema, validate
Expand Down Expand Up @@ -102,6 +103,21 @@ class BandSchema(Schema):
res = openapi.schema2jsonschema(BandSchema(partial=("drummer",)))
assert res["required"] == ["bassist"]

@pytest.mark.parametrize("ordered_schema", (True, False))
def test_ordered(self, openapi, ordered_schema):
class BandSchema(Schema):
class Meta:
ordered = ordered_schema

drummer = fields.Str()
bassist = fields.Str()

res = openapi.schema2jsonschema(BandSchema)
assert isinstance(res["properties"], OrderedDict) == ordered_schema

res = openapi.schema2jsonschema(BandSchema())
assert isinstance(res["properties"], OrderedDict) == ordered_schema

def test_no_required_fields(self, openapi):
class BandSchema(Schema):
drummer = fields.Str()
Expand Down