Rewrite integration tests to work with sharp

Much less manual buffer manipulation needed, here.

Author: rylnd

test/integration.test.ts

@@ -1,124 +1,118 @@
 import supertest from 'supertest';
 import { expect } from 'chai';
-import webserver from './server';
+import server from './server';
+import sharp = require('sharp');
 
-const im = (any: any) => any;
-
-const parseImage = (res, callback) => {
-  res.setEncoding('binary');
-  res.data = '';
-
-  res.on('data', chunk => {
-    res.data += chunk;
-  });
-
-  res.on('end', () => {
-    callback(null, new Buffer(res.data, 'binary'));
-  });
-};
-
-describe.skip('routing', () => {
-  let request;
+describe('middleware', () => {
+  let metaReader: sharp.Sharp;
 
   beforeEach(() => {
-    request = supertest(webserver);
+    metaReader = sharp();
   });
 
   describe('v2 avatar request', () => {
     it('responds with an image', done => {
-      request
+      supertest(server)
         .get('/avatars/abott')
         .expect('Content-Type', /image/)
         .end(done);
     });
 
     it('can resize an image', done => {
-      request
+      supertest(server)
         .get('/avatars/220/abott')
-        .parse(parseImage)
-        .end((err, res) => {
-          im(res.body).size((_, size) => {
-            expect(size).to.eql({ height: 220, width: 220 });
-            done();
-          });
-        });
+        .pipe(metaReader);
+
+      metaReader
+        .metadata()
+        .then(meta => {
+          expect(meta.height).to.eql(220);
+          expect(meta.width).to.eql(220);
+          done();
+        })
+        .catch(done);
     });
 
     it('can manually compose an image', done => {
-      request
+      supertest(server)
         .get('/avatars/face/eyes1/nose4/mouth11/bbb')
         .expect(200)
         .expect('Content-Type', /image/)
         .end(done);
     });
 
     it('can manually compose an image with a custom size', done => {
-      request
+      supertest(server)
         .get('/avatars/face/eyes1/nose4/mouth11/bbb/50')
         .expect(200)
         .expect('Content-Type', /image/)
-        .parse(parseImage)
-        .end((err, res) => {
-          im(res.body).size((_, size) => {
-            expect(size).to.eql({ height: 50, width: 50 });
-            done();
-          });
-        });
+        .pipe(metaReader);
+
+      metaReader
+        .metadata()
+        .then(meta => {
+          expect(meta.height).to.eql(50);
+          expect(meta.width).to.eql(50);
+          done();
+        })
+        .catch(done);
     });
   });
 
   describe('v2 avatar list requests', () => {
     it('responds with json', done => {
-      request
+      supertest(server)
         .get('/avatars/list')
         .expect('Content-Type', /json/)
         .end(done);
     });
 
     it('responds with a list of possible face parts', done => {
-      request.get('/avatars/list').end((err, res) => {
-        const faceParts = res.body.face;
-        expect(faceParts).to.have.keys('eyes', 'mouth', 'nose');
-        done();
-      });
+      supertest(server)
+        .get('/avatars/list')
+        .end((err, res) => {
+          const faceParts = res.body.face;
+          expect(faceParts).to.have.keys('eyes', 'mouth', 'nose');
+          done();
+        });
     });
   });
 
   describe('v2 avatar random requests', () => {
     it('can randomly generate a new avatar', done => {
       const getRandom = () =>
-        request
+        supertest(server)
           .get('/avatars/random')
           .expect(200)
-          .expect('Content-Type', /image/)
-          .parse(parseImage);
+          .expect('Content-Type', /image/);
+      const metaReader2 = sharp();
 
-      getRandom().end((_, r1) => {
-        getRandom().end((_, r2) => {
-          // @ts-ignore
-          im(r1.body).identify('%#', (_, id1) => {
-            // @ts-ignore
-            im(r2.body).identify('%#', (_, id2) => {
-              expect(id1).not.to.equal(id2);
-              done();
-            });
-          });
-        });
-      });
+      getRandom().pipe(metaReader);
+      getRandom().pipe(metaReader2);
+
+      Promise.all([metaReader.metadata(), metaReader2.metadata()])
+        .then(([meta, meta2]) => {
+          expect(meta.size).not.to.equal(meta2.size);
+          done();
+        })
+        .catch(done);
     });
 
     it('supports a custom size parameter', done => {
-      request
+      supertest(server)
         .get('/avatars/50/random')
         .expect(200)
         .expect('Content-Type', /image/)
-        .parse(parseImage)
-        .end((err, res) => {
-          im(res.body).size((_, size) => {
-            expect(size).to.eql({ height: 50, width: 50 });
-            done();
-          });
-        });
+        .pipe(metaReader);
+
+      metaReader
+        .metadata()
+        .then(meta => {
+          expect(meta.height).to.eql(50);
+          expect(meta.width).to.eql(50);
+          done();
+        })
+        .catch(done);
     });
   });
 });