Merge branch 'pr-74-fixes' into feature/random-endpoint

Author: Jackymancs4

src/routes/avatars.js

@@ -1,10 +1,7 @@
 import Router from 'express';
-import uuid from 'uuid'
+import uuid from 'uuid';
 
-import {
-  allNames,
-  pathFor,
-} from '../lib/imageFiles';
+import { allNames, pathFor } from '../lib/imageFiles';
 import common from './common';
 import { combine } from '../lib/imager';
 import potato from '../lib/potato';
@@ -31,12 +28,6 @@ router.get('/list', function(req, res) {
   return res.set('Content-Type', 'application/json').send(response);
 });
 
-router.get('/:size?/:id', function(req, res, next) {
-  return combine(req.faceParts, req.params.size, function(err, stdout) {
-    return common.sendImage(err, stdout, req, res, next);
-  });
-});
-
 router.get('/:size?/random', function(req, res) {
   var faceParts;
   faceParts = potato.parts(uuid.v4());
@@ -47,6 +38,12 @@ router.get('/:size?/random', function(req, res) {
   });
 });
 
+router.get('/:size?/:id', function(req, res, next) {
+  return combine(req.faceParts, req.params.size, function(err, stdout) {
+    return common.sendImage(err, stdout, req, res, next);
+  });
+});
+
 router.get('/face/:eyes/:nose/:mouth/:color/:size?', function(req, res, next) {
   let faceParts = { color: '#' + req.params.color };
 

test/integration.js

@@ -74,26 +74,37 @@ describe('routing', function() {
   });
 
   describe('v2 avatar random requests', function() {
-
     it('can randomly generate a new avatar', function(done) {
-      request.get('/avatars/random')
-      .expect(200)
-      .expect('Content-Type', /image/)
-      .end(done);
-    });
-
-    it('can randomly generate a new avatar with a custom size', function(done) {
-      request.get('/avatars/50/random')
-      .expect(200)
-      .expect('Content-Type', /image/)
-      .parse(parseImage).end(function(err, res) {
-        im(res.body).size(function(_, size) {
-          expect(size).to.eql({ height: 50, width: 50 });
-          done();
+      const getRandom = () => request
+          .get('/avatars/random')
+          .expect(200)
+          .expect('Content-Type', /image/)
+          .parse(parseImage);
+
+      getRandom().end((_, r1) => {
+        getRandom().end((_, r2) => {
+          im(r1.body).identify('%#', (_, id1) => {
+            im(r2.body).identify('%#', (_, id2) => {
+              expect(id1).not.to.equal(id2);
+              done();
+            });
+          });
         });
       });
     });
 
+    it('supports a custom size parameter', function(done) {
+      request
+        .get('/avatars/50/random')
+        .expect(200)
+        .expect('Content-Type', /image/)
+        .parse(parseImage)
+        .end(function(err, res) {
+          im(res.body).size(function(_, size) {
+            expect(size).to.eql({ height: 50, width: 50 });
+            done();
+          });
+        });
+    });
   });
-
 });