fix(oas3): server variables wrapped in object element

Co-authored-by: Marco Friso <marco.friso@oracle.com>

Author: kylef

packages/openapi3-parser/lib/parser/oas/parseServerObject.js

@@ -86,7 +86,7 @@ const parseServerObject = context => pipeParseResult(context.namespace,
     resource.href = object.get('url');
 
     if (object.hasKey('variables')) {
-      resource.hrefVariables = new context.namespace.elements.HrefVariables(object.get('variables'));
+      resource.hrefVariables = new context.namespace.elements.HrefVariables(object.get('variables').content);
     }
 
     return resource;

packages/openapi3-parser/test/unit/parser/oas/parseOpenAPIObject-test.js

@@ -91,7 +91,7 @@ describe('#parseOpenAPIObject', () => {
     expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
     expect(hrefVariables.length).to.equal(1);
 
-    const hrefVariable = hrefVariables.content.content[0];
+    const hrefVariable = hrefVariables.content[0];
     expect(hrefVariable).to.be.instanceof(namespace.elements.Member);
     expect(hrefVariable.key.toValue()).to.equal('username');
     expect(hrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');

packages/openapi3-parser/test/unit/parser/oas/parseOperationObject-test.js

@@ -568,7 +568,7 @@ describe('Operation Object', () => {
       expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
       expect(hrefVariables.length).to.equal(1);
 
-      const hrefVariable = hrefVariables.content.content[0];
+      const hrefVariable = hrefVariables.content[0];
       expect(hrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(hrefVariable.key.toValue()).to.equal('username');
       expect(hrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');

packages/openapi3-parser/test/unit/parser/oas/parsePathItemObject-test.js

@@ -478,7 +478,7 @@ describe('Path Item Object', () => {
       expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
       expect(hrefVariables.length).to.equal(1);
 
-      const hrefVariable = hrefVariables.content.content[0];
+      const hrefVariable = hrefVariables.content[0];
       expect(hrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(hrefVariable.key.toValue()).to.equal('username');
       expect(hrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');

packages/openapi3-parser/test/unit/parser/oas/parseServerObject-test.js

@@ -128,8 +128,8 @@ describe('#parseServerObject', () => {
       expect(resource).to.be.instanceof(namespace.elements.Resource);
 
       const { hrefVariables } = resource;
-      const firstHrefVariable = hrefVariables.content.content[0];
-      const secondHrefVariable = hrefVariables.content.content[1];
+      const firstHrefVariable = hrefVariables.content[0];
+      const secondHrefVariable = hrefVariables.content[1];
 
       expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
       expect(hrefVariables.length).to.equal(2);
@@ -187,8 +187,8 @@ describe('#parseServerObject', () => {
       expect(resource).to.be.instanceof(namespace.elements.Resource);
 
       const { hrefVariables } = resource;
-      const firstHrefVariable = hrefVariables.content.content[0];
-      const secondHrefVariable = hrefVariables.content.content[1];
+      const firstHrefVariable = hrefVariables.content[0];
+      const secondHrefVariable = hrefVariables.content[1];
 
       expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
       expect(hrefVariables.length).to.equal(2);
@@ -225,8 +225,8 @@ describe('#parseServerObject', () => {
       expect(resource).to.be.instanceof(namespace.elements.Resource);
 
       const { hrefVariables } = resource;
-      const firstHrefVariable = hrefVariables.content.content[0];
-      const secondHrefVariable = hrefVariables.content.content[1];
+      const firstHrefVariable = hrefVariables.content[0];
+      const secondHrefVariable = hrefVariables.content[1];
 
       expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
       expect(hrefVariables.length).to.equal(2);