~ make tests finish

under the supreme direction of Ruben Verborgh

Author: Eric Prud'hommeaux

package-lock.json

@@ -89,7 +89,7 @@
     "dirty-chai": "^1.2.2",
     "hippie": "^0.5.0",
     "localstorage-memory": "^1.0.2",
-    "mocha": "^3.2.0",
+    "mocha": "^5.1.1",
     "nock": "^9.0.14",
     "node-mocks-http": "^1.5.6",
     "nyc": "^10.1.2",

package.json

@@ -21,8 +21,7 @@ chai.use(require('dirty-chai'))
 // In this test we always assume that we are Alice
 
 describe('Authentication API (OIDC)', () => {
-  let alice, aliceServer
-  let bob, bobServer
+  let alice, bob
 
   let aliceServerUri = 'https://localhost:7000'
   let aliceWebId = 'https://localhost:7000/profile/card#me'
@@ -81,8 +80,8 @@ describe('Authentication API (OIDC)', () => {
   })
 
   after(() => {
-    if (aliceServer) aliceServer.close()
-    if (bobServer) bobServer.close()
+    alicePod.close()
+    bobPod.close()
     fs.removeSync(path.join(aliceDbPath, 'oidc/users'))
     fs.removeSync(path.join(aliceRootPath, 'index.html'))
     fs.removeSync(path.join(aliceRootPath, 'index.html.acl'))

test/integration/authentication-oidc-test.js

@@ -6,7 +6,7 @@ const expect = require('chai').expect
 // In this test we always assume that we are Alice
 
 describe('API', () => {
-  let alice, aliceServer
+  let alice
 
   let aliceServerUri = 'https://localhost:5000'
   let configPath = path.join(__dirname, '../../config')
@@ -47,7 +47,7 @@ describe('API', () => {
   })
 
   after(() => {
-    if (aliceServer) aliceServer.close()
+    alicePod.close()
     fs.removeSync(path.join(aliceRootPath, 'index.html'))
     fs.removeSync(path.join(aliceRootPath, 'index.html.acl'))
   })

test/integration/capability-discovery-test.js

@@ -472,12 +472,11 @@ describe('HTTP APIs', function () {
 
     it('should delete a new and empty container', function (done) {
       server.delete('/delete-test-empty-container/')
-        .expect(function () {
-          // Ensure container was deleted
+        .end(() => {
           server.get('/delete-test-empty-container/')
             .expect(404)
+            .end(done)
         })
-        .end(done)
     })
 
     after(function () {