tests: Promisify some backend tests

src/tests/backend/specs/api/characterEncoding.js

@@ -8,6 +8,7 @@
 
 const common = require('../../common');
 const fs = require('fs');
+const fsp = fs.promises;
 
 let agent;
 const apiKey = common.apiKey;
@@ -20,73 +21,59 @@ describe(__filename, function () {
   before(async function () { agent = await common.init(); });
 
   describe('Connectivity For Character Encoding', function () {
-    it('can connect', function (done) {
-      agent.get('/api/')
-          .expect('Content-Type', /json/)
-          .expect(200, done);
+    it('can connect', async function () {
+      await agent.get('/api/')
+          .expect(200)
+          .expect('Content-Type', /json/);
     });
   });
 
   describe('API Versioning', function () {
-    it('finds the version tag', function (done) {
-      agent.get('/api/')
-          .expect((res) => {
-            apiVersion = res.body.currentVersion;
-            if (!res.body.currentVersion) throw new Error('No version set in API');
-            return;
-          })
-          .expect(200, done);
+    it('finds the version tag', async function () {
+      const res = await agent.get('/api/')
+          .expect(200);
+      apiVersion = res.body.currentVersion;
+      if (!res.body.currentVersion) throw new Error('No version set in API');
     });
   });
 
   describe('Permission', function () {
-    it('errors with invalid APIKey', function (done) {
+    it('errors with invalid APIKey', async function () {
       // This is broken because Etherpad doesn't handle HTTP codes properly see #2343
       // If your APIKey is password you deserve to fail all tests anyway
-      const permErrorURL = `/api/${apiVersion}/createPad?apikey=password&padID=test`;
-      agent.get(permErrorURL)
-          .expect(401, done);
+      await agent.get(`/api/${apiVersion}/createPad?apikey=password&padID=test`)
+          .expect(401);
     });
   });
 
   describe('createPad', function () {
-    it('creates a new Pad', function (done) {
-      agent.get(`${endPoint('createPad')}&padID=${testPadId}`)
-          .expect((res) => {
-            if (res.body.code !== 0) throw new Error('Unable to create new Pad');
-          })
-          .expect('Content-Type', /json/)
-          .expect(200, done);
+    it('creates a new Pad', async function () {
+      const res = await agent.get(`${endPoint('createPad')}&padID=${testPadId}`)
+          .expect(200)
+          .expect('Content-Type', /json/);
+      if (res.body.code !== 0) throw new Error('Unable to create new Pad');
     });
   });
 
   describe('setHTML', function () {
-    it('Sets the HTML of a Pad attempting to weird utf8 encoded content', function (done) {
-      fs.readFile('tests/backend/specs/api/emojis.html', 'utf8', (err, html) => {
-        agent.post(endPoint('setHTML'))
-            .send({
-              padID: testPadId,
-              html,
-            })
-            .expect((res) => {
-              if (res.body.code !== 0) throw new Error("Can't set HTML properly");
-            })
-            .expect('Content-Type', /json/)
-            .expect(200, done);
-      });
+    it('Sets the HTML of a Pad attempting to weird utf8 encoded content', async function () {
+      const res = await agent.post(endPoint('setHTML'))
+          .send({
+            padID: testPadId,
+            html: await fsp.readFile('tests/backend/specs/api/emojis.html', 'utf8'),
+          })
+          .expect(200)
+          .expect('Content-Type', /json/);
+      if (res.body.code !== 0) throw new Error("Can't set HTML properly");
     });
   });
 
   describe('getHTML', function () {
-    it('get the HTML of Pad with emojis', function (done) {
-      agent.get(`${endPoint('getHTML')}&padID=${testPadId}`)
-          .expect((res) => {
-            if (res.body.data.html.indexOf('&#127484') === -1) {
-              throw new Error('Unable to get the HTML');
-            }
-          })
-          .expect('Content-Type', /json/)
-          .expect(200, done);
+    it('get the HTML of Pad with emojis', async function () {
+      const res = await agent.get(`${endPoint('getHTML')}&padID=${testPadId}`)
+          .expect(200)
+          .expect('Content-Type', /json/);
+      if (res.body.data.html.indexOf('&#127484') === -1) throw new Error('Unable to get the HTML');
     });
   });
 });