Improve MarshmallowPlugin.parameter_helper tests

Author: lafrech

src/apispec/ext/marshmallow/__init__.py

@@ -174,7 +174,6 @@ def parameter_helper(self, parameter, **kwargs):
         :param dict parameter: parameter fields. May contain a marshmallow
             Schema class or instance.
         """
-        # In OpenAPIv3, this only works when using the complex form using "content"
         self.resolver.resolve_schema(parameter)
         return parameter
 

src/apispec/ext/marshmallow/schema_resolver.py

@@ -219,7 +219,7 @@ def resolve_schema(self, data):
         if not isinstance(data, dict):
             return
 
-        # OAS 2 component or OAS 3 header
+        # OAS 2 component or OAS 3 parameter or header
         if "schema" in data:
             data["schema"] = self.resolve_schema_dict(data["schema"])
         # OAS 3 component except header

tests/test_ext_marshmallow.py

@@ -220,17 +220,26 @@ class PetFamilySchema(Schema):
 class TestComponentParameterHelper:
     @pytest.mark.parametrize("schema", [PetSchema, PetSchema()])
     def test_can_use_schema_in_parameter(self, spec, schema):
-        if spec.openapi_version.major < 3:
-            param = {"schema": schema}
-        else:
-            param = {"content": {"application/json": {"schema": schema}}}
+        param = {"schema": schema}
         spec.components.parameter("Pet", "body", param)
         parameter = get_parameters(spec)["Pet"]
         assert parameter["in"] == "body"
-        if spec.openapi_version.major < 3:
-            reference = parameter["schema"]
-        else:
-            reference = parameter["content"]["application/json"]["schema"]
+        reference = parameter["schema"]
+        assert reference == build_ref(spec, "schema", "Pet")
+
+        resolved_schema = spec.components.schemas["Pet"]
+        assert resolved_schema["properties"]["name"]["type"] == "string"
+        assert resolved_schema["properties"]["password"]["type"] == "string"
+        assert resolved_schema["properties"]["id"]["type"] == "integer"
+
+    @pytest.mark.parametrize("spec", ("3.0.0",), indirect=True)
+    @pytest.mark.parametrize("schema", [PetSchema, PetSchema()])
+    def test_can_use_schema_in_parameter_with_content(self, spec, schema):
+        param = {"content": {"application/json": {"schema": schema}}}
+        spec.components.parameter("Pet", "body", param)
+        parameter = get_parameters(spec)["Pet"]
+        assert parameter["in"] == "body"
+        reference = parameter["content"]["application/json"]["schema"]
         assert reference == build_ref(spec, "schema", "Pet")
 
         resolved_schema = spec.components.schemas["Pet"]