googleapis · JustinBeckwith · Nov 29, 2018 · Nov 13, 2018 · Nov 14, 2018 · Nov 14, 2018
diff --git a/samples/faceDetection.js b/samples/faceDetection.js
@@ -65,7 +65,7 @@ function highlightFaces(inputFile, faces, outputFile, Canvas, callback) {
     // Open the original image into a canvas
     const img = new Image();
     img.src = image;
-    const canvas = new Canvas(img.width, img.height);
+    const canvas = new Canvas.Canvas(img.width, img.height);
     const context = canvas.getContext('2d');
     context.drawImage(img, 0, 0, img.width, img.height);
 

diff --git a/samples/package.json b/samples/package.json
@@ -17,15 +17,14 @@
     "mathjs": "^5.0.4",
     "natural": "^0.6.1",
     "redis": "^2.8.0",
-    "yargs": "^12.0.0"
+    "yargs": "^12.0.0",
+    "canvas": "^2.0.0"
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "^3.0.0",
     "@google-cloud/storage": "^2.0.0",
     "mocha": "^5.0.0",
     "uuid": "^3.2.1"
   },
-  "optionalDependencies": {
-    "canvas": "^2.0.0"
-  }
+  "optionalDependencies": {}
 }
diff --git a/samples/productSearch/products.v1p3beta1.js b/samples/productSearch/products.v1p3beta1.js
@@ -102,7 +102,7 @@ async function listProducts(projectId, location) {
   // Resource path that represents Google Cloud Platform location.
   const locationPath = client.locationPath(projectId, location);
 
-  const [products] = client.listProducts({parent: locationPath});
+  const [products] = await client.listProducts({parent: locationPath});
   products.forEach(product => {
     console.log(`Product name: ${product.name}`);
     console.log(`Product id: ${product.name.split('/').pop()}`);

diff --git a/samples/productSearch/similarProducts.v1p3beta1.js b/samples/productSearch/similarProducts.v1p3beta1.js
@@ -33,7 +33,7 @@ async function getSimilarProductsFile(
   /**
    * TODO(developer): Uncomment the following line before running the sample.
    */
-  // const projectId = 'java-docs-samples-testing';
+  // const projectId = 'nodejs-docs-samples';
   // const location = 'us-west1';
   // const productSetId = 'indexed_product_set_id_for_testing';
   // const productCategory = 'apparel';

diff --git a/samples/resources/shoes_1.jpg b/samples/resources/shoes_1.jpg
diff --git a/samples/system-test/faceDetection.test.js b/samples/system-test/faceDetection.test.js
@@ -15,43 +15,13 @@
 
 'use strict';
 
-const fs = require(`fs`);
-const path = require(`path`);
+const path = require('path');
 const assert = require('assert');
-const tools = require(`@google-cloud/nodejs-repo-tools`);
-
-class MockCanvas {
-  getContext() {
-    return {
-      drawImage: () => {},
-      beginPath: () => {},
-      lineTo: () => {},
-      stroke: () => {},
-    };
-  }
-
-  pngStream() {
-    return {
-      on: (event, cb) => {
-        if (event === 'end') {
-          setTimeout(cb, 1000);
-        } else if (event === `data`) {
-          /* eslint-disable */
-          cb(`test`);
-          cb(`foo`);
-          cb(`bar`);
-          /* eslint-enable */
-        }
-      },
-    };
-  }
-}
-
-MockCanvas.Image = class Image {};
-
-const faceDetectionExample = require(`../faceDetection`);
-const inputFile = path.join(__dirname, `../resources`, `face.png`);
-const outputFile = path.join(__dirname, `../../vision`, `out.png`);
+const tools = require('@google-cloud/nodejs-repo-tools');
+const cmd = `node faceDetection.js`;
+const cwd = path.join(__dirname, `..`);
+const inputFile = path.join(__dirname, '../resources', 'face.png');
+const outputFile = path.join(__dirname, '../../', 'out.png');
 
 describe(`face detection`, () => {
   before(tools.checkCredentials);
@@ -66,23 +36,14 @@ describe(`face detection`, () => {
         console.warn('Face detection timed out!');
       }
     }, 60);
-
-    faceDetectionExample.main(
-      inputFile,
-      outputFile,
-      MockCanvas,
-      (err, faces) => {
-        assert.ifError(err);
-        assert.strictEqual(faces.length, 1);
-
-        const image = fs.readFileSync(outputFile);
-        assert.strictEqual(image.toString(`utf8`), `testfoobar`);
-        assert.ok(console.log.calledWith(`Found 1 face`));
-        assert.ok(console.log.calledWith(`Highlighting...`));
-        assert.ok(console.log.calledWith(`Finished!`));
-        done = true;
-        clearTimeout(timeout);
-      }
+    const output = await tools.runAsync(
+      `${cmd}  ${inputFile} ${outputFile}`,
+      cwd
     );
+    assert.ok(output.includes('Found 1 face'));
+    assert.ok(output.includes('Highlighting...'));
+    assert.ok(output.includes('Finished!'));
+    done = true;
+    clearTimeout(timeout);
   });
 });
diff --git a/...-test/importProductSets.v1p3beta1.test.js → ...-test/importProductSets.v1p3beta1.test.js b/...-test/importProductSets.v1p3beta1.test.js → ...-test/importProductSets.v1p3beta1.test.js
@@ -19,7 +19,7 @@ const path = require(`path`);
 const assert = require('assert');
 const tools = require(`@google-cloud/nodejs-repo-tools`);
 const cmd = `node importProductSets.v1p3beta1.js`;
-const cwd = path.join(__dirname, `..`);
+const cwd = path.join(__dirname, `..`, `productSearch`);
 
 //Shared fixture data for product tests
 const testImportProductSets = {

diff --git a/...stem-test/productSearch.v1p3beta1.test.js → ...stem-test/productSearch.v1p3beta1.test.js b/...stem-test/productSearch.v1p3beta1.test.js → ...stem-test/productSearch.v1p3beta1.test.js
@@ -16,20 +16,22 @@
 'use strict';
 
 const path = require(`path`);
+const uuid = require(`uuid`);
 const vision = require('@google-cloud/vision').v1p3beta1;
 const productSearchClient = new vision.ProductSearchClient();
 const assert = require('assert');
 const tools = require(`@google-cloud/nodejs-repo-tools`);
 const cmd = `node productSearch.v1p3beta1.js`;
-const cwd = path.join(__dirname, `..`);
+const cwd = path.join(__dirname, `..`, `productSearch`);
 
 // Shared fixture data for product tests
 const testProductSet = {
   projectId: process.env.GCLOUD_PROJECT,
   location: 'us-west1',
   productCategory: 'homegoods',
-  productId: 'test_product_id_1',
-  productSetId: 'test_product_set_id_1',
+  productId: `test_product_id${uuid.v4()}`,
+  productDisplayName: 'test_product_display_name_1',
+  productSetId: `test_product_set_id${uuid.v4()}`,
   productSetDisplayName: 'test_product_set_display_name_1',
 };
 
@@ -47,43 +49,43 @@ describe(`product search`, () => {
 
   before(async () => {
     // Create a test product set for each test
-    try {
-      await productSearchClient.createProduct({
-        parent: productSearchClient.locationPath(
-          testProductSet.projectId,
-          testProductSet.location
-        ),
-        productId: testProductSet.productId,
-        product: {
-          displayName: testProductSet.productDisplayName,
-          productCategory: testProductSet.productCategory,
-        },
-      });
-      testProductSet.createdProductPaths.push(testProductSet.productPath);
-    } catch (err) {} // ignore error
+    await productSearchClient.createProduct({
+      parent: productSearchClient.locationPath(
+        testProductSet.projectId,
+        testProductSet.location
+      ),
+      productId: testProductSet.productId,
+      product: {
+        displayName: testProductSet.productDisplayName,
+        productCategory: testProductSet.productCategory,
+      },
+    });
+    testProductSet.createdProductPaths.push(testProductSet.productPath);
 
-    try {
-      await productSearchClient.createProductSet({
-        parent: productSearchClient.locationPath(
-          testProductSet.projectId,
-          testProductSet.location
-        ),
-        productSetId: testProductSet.productSetId,
-        productSet: {
-          displayName: testProductSet.productSetDisplayName,
-        },
-      });
-      testProductSet.createdProductSetPaths.push(
-        testProductSet.createdProductSetPaths
-      );
-    } catch (err) {} // ignore error
+    await productSearchClient.createProductSet({
+      parent: productSearchClient.locationPath(
+        testProductSet.projectId,
+        testProductSet.location
+      ),
+      productSetId: testProductSet.productSetId,
+      productSet: {
+        displayName: testProductSet.productSetDisplayName,
+      },
+    });
+    testProductSet.createdProductSetPaths.push(
+      testProductSet.createdProductSetPaths
+    );
   });
 
   after(async () => {
     // Delete products sets after each test
     testProductSet.createdProductSetPaths.forEach(async path => {
       try {
         await productSearchClient.deleteProductSet({name: path});
+      } catch (err) {} // ignore error
+    });
+    testProductSet.createdProductPaths.forEach(async path => {
+      try {
         await productSearchClient.deleteProduct({name: path});
       } catch (err) {} // ignore error
     });
@@ -100,18 +102,14 @@ describe(`product search`, () => {
     assert.ok(output.includes(`Product added to product set.`));
   });
 
-  test(`remove a product from a product set`, async () => {
+  it(`should remove a product from a product set`, async () => {
     const output = await tools.runAsync(
       `${cmd} removeProductFromProductSet "${testProductSet.projectId}" "${
         testProductSet.location
       }" "${testProductSet.productId}" "${testProductSet.productSetId}"`,
       cwd
     );
 
-    console.log('---------------');
-    console.log(output);
-    console.log('---------------');
-
     assert.ok(output.includes(`Product removed from product set.`));
   });
 });
diff --git a/...system-test/productSets.v1p3beta1.test.js → ...system-test/productSets.v1p3beta1.test.js b/...system-test/productSets.v1p3beta1.test.js → ...system-test/productSets.v1p3beta1.test.js
@@ -22,13 +22,13 @@ const productSearch = new vision.ProductSearchClient();
 const assert = require('assert');
 const tools = require(`@google-cloud/nodejs-repo-tools`);
 const cmd = `node productSets.v1p3beta1.js`;
-const cwd = path.join(__dirname, `..`);
+const cwd = path.join(__dirname, `..`, `productSearch`);
 
 // Shared fixture data for product tests
 const testProductSet = {
   projectId: process.env.GCLOUD_PROJECT,
   location: 'us-west1',
-  productSetId: 'test_product_set_id_1',
+  productSetId: `test_product_set_id${uuid.v4()}`,
   productSetDisplayName: 'test_product_set_display_name_1',
 };
 testProductSet.productSetPath = productSearch.productSetPath(
@@ -57,21 +57,19 @@ describe(`product sets`, () => {
 
   before(async () => {
     // Create a test product set for each test
-    try {
-      await productSearch.createProductSet({
-        parent: productSearch.locationPath(
-          testProductSet.projectId,
-          testProductSet.location
-        ),
-        productSetId: testProductSet.productSetId,
-        productSet: {
-          displayName: testProductSet.productSetDisplayName,
-        },
-      });
-      testProductSet.createdProductSetPaths.push(
-        testProductSet.createdProductSetPaths
-      );
-    } catch (err) {} // ignore error
+    await productSearch.createProductSet({
+      parent: productSearch.locationPath(
+        testProductSet.projectId,
+        testProductSet.location
+      ),
+      productSetId: testProductSet.productSetId,
+      productSet: {
+        displayName: testProductSet.productSetDisplayName,
+      },
+    });
+    testProductSet.createdProductSetPaths.push(
+      testProductSet.createdProductSetPaths
+    );
   });
 
   after(async () => {