Improve the callback async handling, thanks @megoth

Author: kjetilk

lib/utils.js

@@ -18,6 +18,7 @@ module.exports.overQuota = overQuota
 
 const fs = require('fs-extra')
 const path = require('path')
+const util = require('util')
 const $rdf = require('rdflib')
 const from = require('from2')
 const url = require('url')
@@ -284,19 +285,17 @@ function getQuota (root, serverUri) {
 }
 
 async function overQuota (root, serverUri) {
-  var actualSize = await _asyncGetSize(root)
   let quota = getQuota(root, serverUri)
-  console.log(root)
+  console.log(root, quota)
+  if (quota === Infinity) {
+    return false
+  }
+  var actualSize = await _asyncGetSize(root)
   console.log(actualSize, quota)
   return (actualSize > quota)
 }
 
 function _asyncGetSize (root) {
-  return new Promise((resolve, reject) =>
-    getSize(root, (err) => {
-      reject(err)
-    },
-    (size) => {
-      resolve(size)
-    }))
+  return util.promisify(getSize)(root)
 }
+

test/integration/quota-test.js

@@ -25,10 +25,10 @@ describe('Get Quota', function () {
 
 describe('Check if over Quota', function () {
   it('Check the quota', function () {
-    expect(overQuota(path.join('test/resources/', root), 'https://localhost')).to.be.false()
+    expect(overQuota(path.join('test/resources/', root), 'https://localhost')).to.be.true
   })
   it('Check the quota with non-existant file', function () {
-    expect(overQuota(path.join('nowhere/', root), 'https://localhost')).to.be.false()
+    expect(overQuota(path.join('nowhere/', root), 'https://localhost')).to.be.false
   })
   it('Check the quota when the predicate is not present', function () {
     expect(overQuota('test/resources/accounts-acl/quota', 'https://localhost')).to.be.false()