improved setRequestedIncludes F, added tests

Author: rocknrolla777

lib/utils.js

@@ -246,14 +246,16 @@ function setRequestedIncludes (include) {
   if (typeof include === 'string') {
     return include
   }
+  if (include instanceof Array) {
+    return include.map(function (inc) {
+      if (typeof inc === 'string') {
+        return inc
+      }
 
-  return include.map(function (inc) {
-    if (typeof inc === 'string') {
-      return inc
-    }
-
-    if (inc instanceof Object) {
-      return inc.relation
-    }
-  })
+      if (inc instanceof Object) {
+        return inc.relation
+      }
+    })
+  }
+  return include
 }

test/scopeInclude.test.js

@@ -127,6 +127,28 @@ describe('include option', function () {
             done()
           })
       })
+      it('should include comments', function (done) {
+        request(app)
+          .get('/posts/1?filter={"include":["comments"]}')
+          .end(function (err, res) {
+            expect(err).to.equal(null)
+            expect(res.body.included.length).equal(2)
+            expect(res.body.included[0].type).equal('comments')
+            expect(res.body.included[1].type).equal('comments')
+            done()
+          })
+      })
+      it('should include categories with empty attributes object', function (done) {
+        request(app)
+          .get('/posts/1?filter={"include":[{"relation":"category", "scope": {"fields": ["id"]}}]}')
+          .end(function (err, res) {
+            expect(err).to.equal(null)
+            expect(res.body.included.length).equal(3)
+            expect(res.body.included[0].type).equal('categories')
+            expect(res.body.included[0].attributes).to.include({})
+            done()
+          })
+      })
     })
   })
 })