From fdd16b1edb8971fe782042fbe0cc2c5a6be8891b Mon Sep 17 00:00:00 2001
From: Alvaro Cabrera <pateketrueke@gmail.com>
Date: Thu, 24 Nov 2016 23:47:24 -0600
Subject: [PATCH] Shuffle before merge; fixes #179
---
lib/types/object.js | Bin 3661 -> 3677 bytes
ts/types/object.ts | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/types/object.js b/lib/types/object.js
index 9f80d69a274bd9dc404d1a6d5da9fc7b3a1f3ee7..57fdacd5ec54f70fa94e5f5fd631e22faf78b474 100644
GIT binary patch
delta 38
ucmX>rb5~}=8dm<I#JrUJT)pCq(zLXkRE^1NSTz_mC%<P`-u#_4i~|5CfDUE=
delta 20
ccmcaBb5>@<8rI3XSv4mAXII|L&KAZ209};_nE(I)
diff --git a/ts/types/object.ts b/ts/types/object.ts
index 97cb723d..7e334c86 100644
--- a/ts/types/object.ts
+++ b/ts/types/object.ts
@@ -37,7 +37,7 @@ var objectType: FTypeGenerator = function objectType(value: IObjectSchema, path,
var min = Math.max(value.minProperties || 0, requiredProperties.length);
var max = Math.max(value.maxProperties || random.number(min, min + 5));
- patternPropertyKeys.concat(propertyKeys).forEach(function(_key) {
+ random.shuffle(patternPropertyKeys.concat(propertyKeys)).forEach(function(_key) {
if (requiredProperties.indexOf(_key) === -1) {
requiredProperties.push(_key);
}
--
GitLab