Add more integration testing (#8)

* why isn't sandbox workingggg

* clean up emojme download spec and save behavior

* fixup userstats

* one more test and sketches for the next file

Author: jackellenberger

emojme-download.js

@@ -34,13 +34,16 @@ async function download(subdomains, tokens, options) {
   let [authPairs] = Helpers.zipAuthPairs(subdomains, tokens);
 
   let downloadPromises = authPairs.map(async authPair => {
+    let [subdomain, token] = authPair;
+    let saveResults;
+
     let adminList = new EmojiAdminList(...authPair, options.output);
     let emojiList = await adminList.get(options.bustCache);
     if (options.save && options.save.length) {
-      return await EmojiAdminList.save(emojiList, authPair[0], options.save);
+      saveResults = await EmojiAdminList.save(emojiList, subdomain, options.save);
     }
 
-    return {emojiList: emojiList, subdomain: authPair[1]};
+    return {emojiList: emojiList, subdomain: subdomain, saveResults: saveResults};
   });
 
   return Helpers.formatResultsHash(await Promise.all(downloadPromises));

emojme-user-stats.js

@@ -39,10 +39,11 @@ async function userStats(subdomains, tokens, options) {
     let emojiList = await emojiAdminList.get(options.bustCache);
     if (users && users.length > 0) {
       let results = EmojiAdminList.summarizeUser(emojiList, authPair[0], users)
-      results.forEach(result => {
+      return results.map(result => {
         let safeUserName = result.user.toLowerCase().replace(/ /g, '-');
         FileUtils.writeJson(`./build/${safeUserName}.${result.subdomain}.adminList.json`, result.userEmoji, null, 3);
-        return results;
+        debugger;
+        return {subdomain: authPair[0], userStatsResults: results};
       });
     } else {
       let results = EmojiAdminList.summarizeSubdomain(emojiList, authPair[0], options.top)
@@ -51,7 +52,7 @@ async function userStats(subdomains, tokens, options) {
         FileUtils.writeJson(`./build/${safeUserName}.${result.subdomain}.adminList.json`, result.userEmoji, null, 3);
       });
 
-      return results;
+      return {subdomain: authPair[0], userStatsResults: results};
     }
   });
 

lib/emoji-admin-list.js

@@ -122,7 +122,6 @@ class EmojiAdminList {
       .value();
     console.log(`The top ${n} contributors for ${subdomain}'s ${emojiList.length} emoji are:`);
     let topUsers = sortedUsers.slice(0, n);
-    debugger;
     return this.summarizeUser(emojiList, subdomain, topUsers.map(e => e.user));
   }
 
@@ -160,7 +159,7 @@ class EmojiAdminList {
       groupedEmoji[user].forEach(emoji => {
         try {
           let fileType;
-          if (emoji.url.match(/^http.*/)) {
+          if (emoji.url.match(/^.*\.(gif|png|jpg|jpg)$/)) {
             fileType = emoji.url.split('.').slice(-1);
           } else if (path.match(/^data:.*/)) {
             fileType = emoji.url.match(/^data:image\/(gif|png|jpg|jpeg).*/)
@@ -171,7 +170,7 @@ class EmojiAdminList {
 
           promiseArray.push(FileUtils.getData(emoji.url)
             .then(emojiData => FileUtils.saveData(emojiData, path))
-            .then(() => process.stdout.write('.'))
+            .then(() => { process.stdout.write('.'); return path; })
           )
         } catch (err) {
           // There is a bizarre case where you can make an alias for a default emoji
@@ -182,7 +181,7 @@ class EmojiAdminList {
       });
     });
 
-    return {results: await Promise.all(promiseArray), emojiList: emojiList, subdomain: subdomain};
+    return await Promise.all(promiseArray);
   }
 }
 

package-lock.json

@@ -15,7 +15,8 @@
   "scripts": {
     "test": "mocha spec/unit/**/* && mocha spec/integration/**/*",
     "test:unit": "mocha spec/unit/**/*",
-    "test:integration": "mocha spec/integration/**/*"
+    "test:integration": "mocha spec/integration/**/*",
+    "test:debug": "node inspect node_modules/mocha/bin/_mocha"
   },
   "license": "ISC",
   "dependencies": {

package.json

@@ -0,0 +1,58 @@
+const assert = require('chai').assert;
+const sinon = require('sinon');
+const fs = require('graceful-fs');
+
+let specHelper = require('../spec-helper');
+let EmojiAdd = require('../../lib/emoji-add');
+let EmojiAdminList = require('../../lib/emoji-admin-list');
+let SlackClient = require('../../lib/slack-client');
+let FileUtils = require('../../lib/util/file-utils');
+let download = require('../../emojme-download').download;
+
+let sandbox;
+let getStub;
+let saveDataStub;
+
+beforeEach(() => {
+  sandbox = sinon.createSandbox();
+});
+
+afterEach(() => {
+  sandbox.restore();
+});
+
+describe('download', () => {
+  let subdomains = ['subdomain1', 'subdomain2'];
+  let tokens = ['token1', 'token2'];
+
+  beforeEach(() => {
+    getStub = sandbox.stub(EmojiAdminList.prototype, 'get');
+    getStub.resolves(
+      specHelper.testEmojiList(10)
+    );
+
+    // prevent writing during tests
+    sandbox.stub(FileUtils, 'saveData').callsFake((arg1, arg2) => Promise.resolve(arg2));
+    sandbox.stub(FileUtils, 'mkdirp');
+  });
+
+  it('downloads emojiList when save is not set', () => {
+    return download(subdomains, tokens).then(results => {
+      assert.deepEqual(results.subdomain1.emojiList, specHelper.testEmojiList(10));
+      assert.deepEqual(results.subdomain2.emojiList, specHelper.testEmojiList(10));
+
+      assert.deepEqual(results.subdomain1.saveResults, undefined);
+      assert.deepEqual(results.subdomain2.saveResults, undefined);
+    });
+  });
+
+  it('downloads emoji for specified users when save is set', () => {
+    return download(subdomains, tokens, {save: ['test-user-1', 'test-user-0']}).then(results => {
+      assert.deepEqual(results.subdomain1.emojiList, specHelper.testEmojiList(10));
+      assert.deepEqual(results.subdomain2.emojiList, specHelper.testEmojiList(10));
+
+      assert.equal(results.subdomain1.saveResults.length, 10);
+      assert.equal(results.subdomain2.saveResults.length, 10);
+    });
+  });
+});

spec/integration/emojme-download-spec.js

@@ -1,4 +1,6 @@
-const assert = require('chai').assert;
+const chai = require('chai');
+const assert = chai.assert;
+
 const sinon = require('sinon');
 const fs = require('graceful-fs');
 
@@ -8,6 +10,8 @@ let SlackClient = require('../../lib/slack-client');
 let upload = require('../../emojme-upload').upload;
 
 let sandbox;
+let uploadStub;
+
 beforeEach(function () {
   sandbox = sinon.createSandbox();
 });
@@ -18,14 +22,42 @@ afterEach(function () {
 
 describe('upload', () => {
   beforeEach(function () {
-    let uploadStub = sandbox.stub(EmojiAdd.prototype, 'upload');
+    uploadStub = sandbox.stub(EmojiAdd.prototype, 'upload');
     uploadStub.callsFake(arg1 => Promise.resolve({subdomain: 'subdomain', emojiList: arg1}));
 
     sandbox.stub(EmojiAdminList.prototype, 'get').withArgs(sinon.match.any).resolves(
       [{ name: 'emoji-1' }]
     );
   });
 
+  it('uploads emoji from specified json', () => {
+    let options = { src: './spec/fixtures/emojiList.json' };
+    let fixture = JSON.parse(fs.readFileSync('./spec/fixtures/emojiList.json', 'utf-8'));
+
+    return upload('subdomain', 'token', options).then(results => {
+      assert.deepEqual(results, { subdomain:
+        {
+          collisions: [
+            fixture[0]
+          ],
+          emojiList: [
+            fixture[1],
+            fixture[2],
+            fixture[3],
+          ]
+        }
+      });
+
+      assert.deepEqual(uploadStub.getCall(0).args, [
+        [
+          fixture[1],
+          fixture[2],
+          fixture[3],
+        ]
+      ]);
+    });
+  });
+
   it('renames emoji to avoid collisions when avoidCollisions is set', () => {
     let options = {
       src: './spec/fixtures/emojiList.json',

spec/integration/emojme-upload-spec.js

@@ -0,0 +1,36 @@
+const assert = require('chai').assert;
+const sinon = require('sinon');
+const fs = require('graceful-fs');
+
+let specHelper = require('../spec-helper');
+let EmojiAdd = require('../../lib/emoji-add');
+let EmojiAdminList = require('../../lib/emoji-admin-list');
+let SlackClient = require('../../lib/slack-client');
+let FileUtils = require('../../lib/util/file-utils');
+let download = require('../../emojme-download').download;
+
+let sandbox;
+
+beforeEach(() => {
+  sandbox = sinon.createSandbox();
+});
+
+afterEach(() => {
+  sandbox.restore();
+});
+
+describe('user-stats', () => {
+  let subdomains = ['subdomain1', 'subdomain2'];
+  let tokens = ['token1', 'token2'];
+
+  beforeEach(() => {
+    getStub = sandbox.stub(EmojiAdminList.prototype, 'get');
+    getStub.resolves(
+      specHelper.testEmojiList(10)
+    );
+
+    // prevent writing during tests
+    sandbox.stub(FileUtils, 'saveData').callsFake((arg1, arg2) => Promise.resolve(arg2));
+    sandbox.stub(FileUtils, 'mkdirp');
+  });
+});