Fixed broken tests in AccountManager (OIDC account creation tests)

Author: megoth

lib/acl-checker.js

@@ -50,7 +50,10 @@ class ACLChecker {
     // aclCheck.checkAccess(acl.graph, this.resource)
 
     // Check the resource's permissions
-    this.acl = this.acl || await this.getNearestACL()
+    this.acl = this.acl || await this.getNearestACL().catch(err => {
+      throw new HTTPError(403, `Found no ACL file:\n${err}`)
+    })
+    // console.log('TEST', this.acl)
     const resource = rdf.sym(this.resource)
     // const directory = this.acl.isContainer ? this.resource : null
     const directory = this.acl.isContainer ? rdf.sym(ACLChecker.getDirectory(this.acl.acl)) : null
@@ -96,10 +99,11 @@ class ACLChecker {
     let isContainer = false
     // let directory = null
     // Create a cascade of reject handlers (one for each possible ACL)
-    const nearestACL = this.getPossibleACLs().reduce((prevACL, acl) => {
+    const possibleACLs = this.getPossibleACLs()
+    const nearestACL = possibleACLs.reduce((prevACL, acl) => {
       return prevACL.catch(() => new Promise((resolve, reject) => {
         this.fetch(acl, (err, graph) => {
-          if (err && err.code !== 'ENOENT' || !graph || !graph.length) {
+          if (err && err.code !== 'ENOENT') {
             isContainer = true
             reject(err)
           } else {
@@ -110,7 +114,7 @@ class ACLChecker {
         })
       }))
     }, Promise.reject())
-    return nearestACL.catch(e => { throw new Error('No ACL resource found') })
+    return nearestACL.catch(e => { throw new Error(`No ACL resource found, searched in \n- ${possibleACLs.join('\n- ')}`) })
   }
 
 // Gets all possible ACL paths that apply to the resource

test/integration/account-creation-oidc-test.js

@@ -183,39 +183,48 @@ describe('AccountManager (OIDC account creation tests)', function () {
         })
     }).timeout(20000)
 
-    it('should create a private settings container', function (done) {
-      var subdomain = supertest('https://nicola.' + host)
-      subdomain.head('/settings/')
-        .expect(401)
-        .end(function (err) {
-          done(err)
-        })
-    })
+    describe('after setting up account', () => {
+      beforeEach(done => {
+        var subdomain = supertest('https://nicola.' + host)
+        subdomain.post('/api/accounts/new')
+          .send('username=nicola&password=12345&acceptToc=true')
+          .end(done)
+      })
 
-    it('should create a private prefs file in the settings container', function (done) {
-      var subdomain = supertest('https://nicola.' + host)
-      subdomain.head('/inbox/prefs.ttl')
-        .expect(401)
-        .end(function (err) {
-          done(err)
-        })
-    })
+      it('should create a private settings container', function (done) {
+        var subdomain = supertest('https://nicola.' + host)
+        subdomain.head('/settings/')
+          .expect(401)
+          .end(function (err) {
+            done(err)
+          })
+      })
 
-    it('should create a private inbox container', function (done) {
-      var subdomain = supertest('https://nicola.' + host)
-      subdomain.head('/inbox/')
-        .expect(401)
-        .end(function (err) {
-          done(err)
-        })
+      it('should create a private prefs file in the settings container', function (done) {
+        var subdomain = supertest('https://nicola.' + host)
+        subdomain.head('/inbox/prefs.ttl')
+          .expect(401)
+          .end(function (err) {
+            done(err)
+          })
+      })
+
+      it('should create a private inbox container', function (done) {
+        var subdomain = supertest('https://nicola.' + host)
+        subdomain.head('/inbox/')
+          .expect(401)
+          .end(function (err) {
+            done(err)
+          })
+      })
     })
   })
 })
 
 describe('Single User signup page', () => {
   const serverUri = 'https://localhost:7457'
   const port = 7457
-  var ldpHttpsServer
+  let ldpHttpsServer
   const rootDir = path.join(__dirname, '../resources/accounts/single-user/')
   const configPath = path.join(__dirname, '../resources/config')
   const ldp = ldnode.createServer({
@@ -231,7 +240,9 @@ describe('Single User signup page', () => {
   const server = supertest(serverUri)
 
   before(function (done) {
-    ldpHttpsServer = ldp.listen(port, done)
+    ldpHttpsServer = ldp.listen(port, () => server.post('/api/accounts/new')
+      .send('username=foo&password=12345&acceptToc=true')
+      .end(done))
   })
 
   after(function () {