fix: pick changes from #620

json-schema-faker · Dec 1, 2020 · 6e30bc8 · 6e30bc8
1 parent c5b54a4
commit 6e30bc8
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 23 deletions.
diff --git a/src/lib/types/array.js b/src/lib/types/array.js
@@ -66,15 +66,15 @@ function arrayType(value, path, resolve, traverseCallback) {
 
   if (defaultMinItems) {
     // fix boundaries
-    minItems = typeof maxItems === 'undefined'
+    minItems = typeof minItems === 'undefined'
       ? defaultMinItems
-      : Math.min(defaultMinItems, maxItems);
+      : Math.min(defaultMinItems, minItems);
   }
 
   if (defaultMaxItems) {
-    maxItems = typeof minItems === 'undefined'
+    maxItems = typeof maxItems === 'undefined'
       ? defaultMaxItems
-      : Math.min(defaultMaxItems, minItems);
+      : Math.min(defaultMaxItems, maxItems);
 
     // Don't allow user to set max items above our maximum
     if (maxItems && maxItems > defaultMaxItems) {

diff --git a/tests/schema/core/issues/issue-620.json b/tests/schema/core/issues/issue-620.json
@@ -0,0 +1,64 @@
+[
+  {
+    "description": "Fix again min and maxItem generation",
+    "tests": [
+      {
+        "description": "minItems is a valid boundary if set to zero",
+        "schema": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "default": 1
+          },
+          "minItems": 0,
+          "maxItems": 5
+        },
+        "repeat": 100,
+        "valid": true,
+        "set": {
+          "minItems": 7,
+          "maxItems": 7,
+          "useDefaultValue": true
+        },
+        "lessThan": 6
+      },
+      {
+        "description": "ignore minItems and maxItems if already set",
+        "schema": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "default": 1
+          },
+          "minItems": 3,
+          "maxItems": 5
+        },
+        "repeat": 100,
+        "valid": true,
+        "set": {
+          "maxItems": 7,
+          "useDefaultValue": true
+        },
+        "atLeast": 3
+      },
+      {
+        "description": "set minItems and/or maxItems if they are not defined",
+        "schema": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "default": 1
+          }
+        },
+        "repeat": 100,
+        "valid": true,
+        "set": {
+          "minItems": 7,
+          "maxItems": 7,
+          "useDefaultValue": true
+        },
+        "length": 7
+      }
+    ]
+  }
+]
diff --git a/tests/schema/core/types/array.json b/tests/schema/core/types/array.json
@@ -82,25 +82,6 @@
         },
         "equal": [1, 1, 1, 1, 1, 1, 1]
       },
-      {
-        "description": "should handle minItems and maxItems passed as arguments to JSF, and minItems is 0",
-        "schema": {
-          "type": "array",
-          "items": {
-            "type": "integer",
-            "default": 1
-          },
-          "minItems": 0,
-          "maxItems": 5
-        },
-        "valid": true,
-        "set": {
-          "minItems": 7,
-          "maxItems": 7,
-          "useDefaultValue": true
-        },
-        "lessThan": 7
-      },      
       {
         "description": "should handle uniqueItems",
         "schema": {

diff --git a/tests/schema/helpers.js b/tests/schema/helpers.js
@@ -131,6 +131,10 @@ export function tryTest(nth, max, test, refs, schema) {
         expect(sample.length).to.be.below(test.lessThan);
       }
 
+      if (test.atLeast) {
+        expect(sample.length).to.be.above(test.atLeast - 1);
+      }
+
       if (test.hasNot) {
         expect(JSON.stringify(sample)).not.to.contain(test.hasNot);
       }