Merge 39a46b9 into 9f62670

punchcard-cms · Jul 11, 2017 · 311db22 · 311db22
2 parents 9f62670 + 39a46b9
commit 311db22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "acl": "^0.4.9",
+    "acl": "^0.4.10",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.17.2",
     "breakpoint-sass": "^2.7.1",

diff --git 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 => {