Switch from Mocha to Ava for faster tests (#289)

* Switch from Mocha to Ava

* Concurrency: 5

Author: jmdobry

vision/samples/package.json

@@ -5,8 +5,7 @@
   "license": "Apache Version 2.0",
   "author": "Google Inc.",
   "scripts": {
-    "test": "cd ..; npm run t -- vision/test/*.test.js",
-    "system-test": "cd ..; npm run st -- vision/system-test/*.test.js"
+    "test": "cd ..; npm run st -- vision/system-test/*.test.js"
   },
   "dependencies": {
     "@google-cloud/vision": "0.7.0",

vision/samples/quickstart.js

@@ -31,13 +31,11 @@ const visionClient = Vision({
 const fileName = './resources/wakeupcat.jpg';
 
 // Performs label detection on the image file
-visionClient.detectLabels(fileName, (err, labels) => {
-  if (err) {
-    console.error(err);
-    return;
-  }
+visionClient.detectLabels(fileName)
+  .then((results) => {
+    const labels = results[0];
 
-  console.log('Labels:');
-  labels.forEach((label) => console.log(label));
-});
+    console.log('Labels:');
+    labels.forEach((label) => console.log(label));
+  });
 // [END vision_quickstart]

vision/samples/system-test/faceDetection.test.js

@@ -15,57 +15,54 @@
 
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
+require(`../../system-test/_setup`);
 
-function MockCanvas () {
-  this.getContext = function () {
+const fs = require(`fs`);
+const path = require(`path`);
+
+class MockCanvas {
+  getContext () {
     return {
-      drawImage: function () {},
-      beginPath: function () {},
-      lineTo: function () {},
-      stroke: function () {}
+      drawImage: () => {},
+      beginPath: () => {},
+      lineTo: () => {},
+      stroke: () => {}
     };
-  };
-  this.pngStream = function () {
+  }
+
+  pngStream () {
     return {
-      on: function (event, cb) {
+      on: (event, cb) => {
         if (event === 'end') {
-          setTimeout(function () {
-            cb();
-          }, 1000);
-        } else if (event === 'data') {
-          cb('test');
-          cb('foo');
-          cb('bar');
+          setTimeout(cb, 1000);
+        } else if (event === `data`) {
+          cb(`test`);
+          cb(`foo`);
+          cb(`bar`);
         }
       }
     };
-  };
+  }
 }
 
-MockCanvas.Image = function () {};
+MockCanvas.Image = class Image {};
 
-var faceDetectionExample = require('../faceDetection');
-var inputFile = path.join(__dirname, '../resources', 'face.png');
-var outputFile = path.join(__dirname, '../../vision', 'out.png');
+const faceDetectionExample = require(`../faceDetection`);
+const inputFile = path.join(__dirname, `../resources`, `face.png`);
+const outputFile = path.join(__dirname, `../../vision`, `out.png`);
 
-describe('vision:faceDetection', function () {
-  it('should detect faces', function (done) {
-    faceDetectionExample.main(
-      inputFile,
-      outputFile,
-      MockCanvas,
-      function (err, faces) {
-        assert.ifError(err);
-        assert(faces.length === 1);
-        var image = fs.readFileSync(outputFile);
-        assert(image.toString('utf8') === 'testfoobar');
-        assert(console.log.calledWith('Found 1 face'));
-        assert(console.log.calledWith('Highlighting...'));
-        assert(console.log.calledWith('Finished!'));
-        done();
-      }
-    );
+test.before(stubConsole);
+test.after(restoreConsole);
+
+test.cb(`should detect faces`, (t) => {
+  faceDetectionExample.main(inputFile, outputFile, MockCanvas, (err, faces) => {
+    t.ifError(err);
+    t.is(faces.length, 1);
+    const image = fs.readFileSync(outputFile);
+    t.is(image.toString(`utf8`), `testfoobar`);
+    t.true(console.log.calledWith(`Found 1 face`));
+    t.true(console.log.calledWith(`Highlighting...`));
+    t.true(console.log.calledWith(`Finished!`));
+    t.end();
   });
 });

vision/samples/system-test/labelDetection.test.js

@@ -15,20 +15,21 @@
 
 'use strict';
 
-var path = require('path');
-var labelDetectionSample = require('../labelDetection');
-var inputFile = path.join(__dirname, '../resources', 'cat.jpg');
+require(`../../system-test/_setup`);
 
-describe('vision:labelDetection', function () {
-  it('should detect labels', function (done) {
-    labelDetectionSample.main(
-      inputFile,
-      function (err, labels) {
-        assert.ifError(err);
-        assert(labels.length > 0);
-        assert(console.log.calledWith('Found label: cat for ' + inputFile));
-        done();
-      }
-    );
+const path = require(`path`);
+
+const labelDetectionSample = require(`../labelDetection`);
+const inputFile = path.join(__dirname, `../resources`, `cat.jpg`);
+
+test.before(stubConsole);
+test.after(restoreConsole);
+
+test.cb(`should detect labels`, (t) => {
+  labelDetectionSample.main(inputFile, (err, labels) => {
+    t.ifError(err);
+    t.true(labels.length > 0);
+    t.true(console.log.calledWith(`Found label: cat for ${inputFile}`));
+    t.end();
   });
 });

vision/samples/system-test/landmarkDetection.test.js

@@ -15,16 +15,19 @@
 
 'use strict';
 
-var landmarkDetectionSample = require('../landmarkDetection');
-var inputFile = 'https://cloud-samples-tests.storage.googleapis.com/vision/water.jpg';
+require(`../../system-test/_setup`);
 
-describe('vision:landmarkDetection', function () {
-  it('should detect landmarks', function (done) {
-    landmarkDetectionSample.main(inputFile, function (err, landmarks) {
-      assert.ifError(err);
-      assert(landmarks.length > 0);
-      assert(console.log.calledWith('Found landmark: Taitung, Famous Places "up the water flow" marker for ' + inputFile));
-      done();
-    });
+const landmarkDetectionSample = require(`../landmarkDetection`);
+const inputFile = `https://cloud-samples-tests.storage.googleapis.com/vision/water.jpg`;
+
+test.before(stubConsole);
+test.after(restoreConsole);
+
+test.cb(`should detect landmarks`, (t) => {
+  landmarkDetectionSample.main(inputFile, (err, landmarks) => {
+    t.ifError(err);
+    t.true(landmarks.length > 0);
+    t.true(console.log.calledWith(`Found landmark: Taitung, Famous Places "up the water flow" marker for ${inputFile}`));
+    t.end();
   });
 });

vision/samples/system-test/quickstart.test.js

@@ -15,40 +15,45 @@
 
 'use strict';
 
+require(`../../system-test/_setup`);
+
 const proxyquire = require(`proxyquire`).noPreserveCache();
 const vision = proxyquire(`@google-cloud/vision`, {})();
 const path = require(`path`);
 
-describe(`vision:quickstart`, () => {
-  let visionMock, VisionMock;
-
-  it(`should detect labels`, (done) => {
-    const filePath = path.join(__dirname, `../resources/wakeupcat.jpg`);
-    const expectedFileName = `./resources/wakeupcat.jpg`;
-
-    visionMock = {
-      detectLabels: (_fileName, _callback) => {
-        assert.equal(_fileName, expectedFileName);
-        assert.equal(typeof _callback, 'function');
-
-        vision.detectLabels(filePath, (err, labels, apiResponse) => {
-          _callback(err, labels, apiResponse);
-          assert.ifError(err);
-          assert.equal(Array.isArray(labels), true);
-          assert.notEqual(apiResponse, undefined);
-          assert.equal(console.log.called, true);
-          assert.deepEqual(console.log.firstCall.args, [`Labels:`]);
-          labels.forEach((label, i) => {
-            assert.deepEqual(console.log.getCall(i + 1).args, [label]);
-          });
-          done();
+test.before(stubConsole);
+test.after(restoreConsole);
+
+test.cb(`should detect labels`, (t) => {
+  const filePath = path.join(__dirname, `../resources/wakeupcat.jpg`);
+  const expectedFileName = `./resources/wakeupcat.jpg`;
+  const visionMock = {
+    detectLabels: (_fileName) => {
+      t.is(_fileName, expectedFileName);
+
+      return vision.detectLabels(filePath)
+        .then(([labels]) => {
+          t.true(Array.isArray(labels));
+
+          setTimeout(() => {
+            try {
+              t.is(console.log.callCount, 6);
+              t.deepEqual(console.log.getCall(0).args, [`Labels:`]);
+              labels.forEach((label, i) => {
+                t.deepEqual(console.log.getCall(i + 1).args, [label]);
+              });
+              t.end();
+            } catch (err) {
+              t.end(err);
+            }
+          }, 200);
+
+          return [labels];
         });
-      }
-    };
-    VisionMock = sinon.stub().returns(visionMock);
+    }
+  };
 
-    proxyquire(`../quickstart`, {
-      '@google-cloud/vision': VisionMock
-    });
+  proxyquire(`../quickstart`, {
+    '@google-cloud/vision': sinon.stub().returns(visionMock)
   });
 });

vision/samples/system-test/textDetection.test.js

@@ -15,21 +15,22 @@
 
 'use strict';
 
-var path = require('path');
-var inputDir = path.join(__dirname, '../resources');
-var textDetectionSample = require('../textDetection');
+require(`../../system-test/_setup`);
 
-describe('vision:textDetection', function () {
-  it('should detect texts', function (done) {
-    textDetectionSample.main(inputDir, function (err, textResponse) {
-      assert.ifError(err);
-      assert(Object.keys(textResponse).length > 0);
-      textDetectionSample.lookup(['the', 'sunbeams', 'in'], function (err, hits) {
-        assert.ifError(err);
-        assert(hits.length > 0);
-        assert(hits[0].length > 0);
-        done();
-      });
+const path = require(`path`);
+
+const inputDir = path.join(__dirname, `../resources`);
+const textDetectionSample = require(`../textDetection`);
+
+test.cb(`should detect texts`, (t) => {
+  textDetectionSample.main(inputDir, (err, textResponse) => {
+    t.ifError(err);
+    t.true(Object.keys(textResponse).length > 0);
+    textDetectionSample.lookup(['the', 'sunbeams', 'in'], (err, hits) => {
+      t.ifError(err);
+      t.true(hits.length > 0);
+      t.true(hits[0].length > 0);
+      t.end();
     });
   });
 });