Merge f74f667 into eed1ec5

dadi · Jul 17, 2018 · e3f6cae · e3f6cae
2 parents eed1ec5 + f74f667
commit e3f6cae
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/dadi/lib/controller/collections.js b/dadi/lib/controller/collections.js
@@ -45,7 +45,7 @@ Collections.prototype.get = function (req, res, next) {
         version: parts[1],
         database: parts[2],
         name: (model.settings && model.settings.displayName) || model.name,
-        slug: model.slug,
+        slug: model.name,
         path: key
       }
 

diff --git a/test/acceptance/collections-endpoint.js b/test/acceptance/collections-endpoint.js
@@ -117,4 +117,38 @@ describe('Collections endpoint', function () {
       })
     })
   })
+
+  it('should return all the collections if the requesting client has admin access', done => {
+    help.getBearerTokenWithPermissions({
+      accessType: 'admin'
+    }).then(token => {
+      client
+      .get(`/api/collections`)
+      .set('content-type', 'application/json')
+      .set('Authorization', `Bearer ${token}`)
+      .end((err, res) => {
+        let allCollections = help.getCollectionMap()
+
+        res.body.collections.length.should.eql(
+          Object.keys(allCollections).length
+        )
+
+        Object.keys(allCollections).forEach(key => {
+          let match = res.body.collections.some(collection => {
+            collection.version.should.be.String
+            collection.database.should.be.String
+            collection.name.should.be.String
+            collection.slug.should.be.String
+            collection.path.should.be.String
+
+            return collection.path === key
+          })
+
+          match.should.eql(true)
+        })
+
+        done()
+      })
+    })
+  })  
 })