From fe30f3f5e1ff2cee3dec2ffd50adb116b5ffc845 Mon Sep 17 00:00:00 2001
From: greenkeeperio-bot <support@greenkeeper.io>
Date: Wed, 11 Jan 2017 02:14:39 -0600
Subject: [PATCH 1/2] chore(package): update acl to version 0.4.10

https://greenkeeper.io/
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89914ef..7400466 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "acl": "^0.4.9",
+    "acl": "^0.4.10",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.15.2",
     "breakpoint-sass": "^2.7.1",

From 39a46b91d88612e5634915976ff9d325c058a292 Mon Sep 17 00:00:00 2001
From: Scott Nath <snath@us.ibm.com>
Date: Tue, 11 Jul 2017 13:49:19 -0400
Subject: [PATCH 2/2] :bug: compensates for an intermittent fixtures bug

---
 tests/apis.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/apis.js b/tests/apis.js
index 8059faf..f346a4c 100644
--- a/tests/apis.js
+++ b/tests/apis.js
@@ -308,12 +308,18 @@ test.serial('Utils: Format Results - with follow', t => {
 });
 
 test.serial('Utils: Format Results - depth with follow', t => {
-  const testable = utils.testables(live, allTypes);
+  let testable = utils.testables(live, allTypes);
   const query = {
     follow: 'true',
     depth: 2, // depth gets subtracted during attributes, to see depth the format function needs at least depth: two
   };
 
+  // fixes a bug where sometimes testable.model.attributes is null
+  if (!testable.model || !testable.model.attributes) {
+    const refixtures = utils.generate(generated, lang);
+    testable = utils.testables(refixtures.live, refixtures.types.full);
+  }
+
   const formatted = apiUtils.format([testable.expected], testable.model.attributes, allTypes, query);
 
   return formatted.then(result => {