adding more tests

raml-org · Nov 22, 2017 · 765c1d5 · 765c1d5
1 parent a010449
commit 765c1d5
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 2 deletions.
diff --git a/src/canonical.js b/src/canonical.js
@@ -162,7 +162,7 @@ function toCanonical (form) {
       return subType
     } else {
       const superType = toCanonical(type)
-      const res = minType(superType, subType)
+      const res = minType(superType, toCanonical(subType))
       return toCanonical(res)
     }
   }

diff --git a/src/minType.js b/src/minType.js
@@ -283,6 +283,7 @@ function minType (sup, sub) {
     computed.type = superType
     // 8.1. for each value `i` `elem-super` in the property `of` of `super`
     // 8.1.1. we replace `i` in `of` with the output of applying this algorithm to `elem-super` and `sub`
+
     computed.anyOf = sup.anyOf.map(elem => minType(elem, sub))
 
     for (let restriction in restrictions) {
@@ -300,7 +301,7 @@ function minType (sup, sub) {
   }
 
   if (subType === 'union' && superType !== 'union') {
-    const computed = Object.assign({}, sup)
+    const computed = Object.assign({}, sub)
     let anyOf = sub.anyOf
     computed.anyOf = []
     for (let i = 0; i < anyOf.length; i++) {

diff --git a/test/canonical.js b/test/canonical.js
@@ -18,6 +18,7 @@ describe('canonicalForm()', function () {
 
       const expForm = expandedForm(types[name], types)
       const canForm = canonicalForm(expForm)
+
       expect(canForm).to.deep.equal(forms[name])
     })
   })

diff --git a/test/fixtures/canonical_forms.js b/test/fixtures/canonical_forms.js
@@ -1170,5 +1170,56 @@ module.exports = {
       }
     },
     'additionalProperties': true
+  },
+  UnionInheritance2: {
+    'type': 'union',
+    'anyOf': [
+      {
+        'type': 'object',
+        'properties': {
+          'a': {
+            'type': 'string',
+            'required': true,
+            'minLength': 5,
+            'maxLength': 10
+          }
+        },
+        'additionalProperties': true
+      },
+      {
+        'type': 'object',
+        'properties': {
+          'a': {
+            'type': 'string',
+            'required': true,
+            'minLength': 6,
+            'maxLength': 10
+          }
+        },
+        'additionalProperties': true
+      },
+      {
+        'type': 'object',
+        'properties': {
+          'a': {
+            'type': 'string',
+            'required': true,
+            'minLength': 5
+          }
+        },
+        'additionalProperties': true
+      },
+      {
+        'type': 'object',
+        'properties': {
+          'a': {
+            'type': 'string',
+            'required': true,
+            'minLength': 6
+          }
+        },
+        'additionalProperties': true
+      }
+    ]
   }
 }
diff --git a/test/fixtures/expanded_forms.js b/test/fixtures/expanded_forms.js
@@ -1355,5 +1355,45 @@ module.exports = {
       }
     },
     'additionalProperties': true
+  },
+  UnionInheritance2: {
+    'type': {
+      'type': 'object',
+      'properties': {
+        'a': {
+          'type': 'union',
+          'anyOf': [
+            {
+              'type': 'string',
+              'minLength': 2,
+              'maxLength': 10
+            },
+            {
+              'type': 'string',
+              'minLength': 3
+            }
+          ],
+          'required': true
+        }
+      },
+      'additionalProperties': true
+    },
+    'properties': {
+      'a': {
+        'type': 'union',
+        'anyOf': [
+          {
+            'type': 'string',
+            'minLength': 5
+          },
+          {
+            'type': 'string',
+            'minLength': 6
+          }
+        ],
+        'required': true
+      }
+    },
+    'additionalProperties': true
   }
 }
diff --git a/test/fixtures/types.js b/test/fixtures/types.js
@@ -627,5 +627,41 @@ module.exports = {
         minLength: 4
       }
     }
+  },
+  UnionInheritance2: {
+    type: {
+      type: 'object',
+      properties: {
+        'a': {
+          type: 'union',
+          anyOf: [
+            {
+              type: 'string',
+              minLength: 2,
+              maxLength: 10
+            },
+            {
+              type: 'string',
+              minLength: 3
+            }
+          ]
+        }
+      }
+    },
+    properties: {
+      'a': {
+        type: 'union',
+        anyOf: [
+          {
+            type: 'string',
+            minLength: 5
+          },
+          {
+            type: 'string',
+            minLength: 6
+          }
+        ]
+      }
+    }
   }
 }