fix(deps): remove dependency on string-format-obj (googleapis#231)

Author: JustinBeckwith

handwritten/bigtable/test/app-profile.js

@@ -18,9 +18,7 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var format = require('string-format-obj');
 var proxyquire = require('proxyquire');
-
 const common = require('@google-cloud/common-grpc');
 
 var promisified = false;
@@ -41,11 +39,7 @@ describe('Bigtable/AppProfile', function() {
     bigtable: {projectId: PROJECT_ID},
   };
 
-  var APP_PROFILE_NAME = format('{instance}/appProfiles/{appProfile}', {
-    instance: INSTANCE.name,
-    appProfile: APP_PROFILE_ID,
-  });
-
+  var APP_PROFILE_NAME = `${INSTANCE.name}/appProfiles/${APP_PROFILE_ID}`;
   var AppProfile;
   var appProfile;
 

handwritten/bigtable/test/cluster.js

@@ -18,7 +18,6 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var format = require('string-format-obj');
 var proxyquire = require('proxyquire');
 
 const common = require('@google-cloud/common-grpc');
@@ -41,11 +40,7 @@ describe('Bigtable/Cluster', function() {
     bigtable: {projectId: PROJECT_ID},
   };
 
-  var CLUSTER_NAME = format('{instance}/clusters/{cluster}', {
-    instance: INSTANCE.name,
-    cluster: CLUSTER_ID,
-  });
-
+  var CLUSTER_NAME = `${INSTANCE.name}/clusters/${CLUSTER_ID}`;
   var Cluster;
   var cluster;
 
@@ -105,31 +100,22 @@ describe('Bigtable/Cluster', function() {
     var LOCATION = 'us-centralb-1';
 
     it('should format the location name', function() {
-      var expected = format('projects/{project}/locations/{location}', {
-        project: PROJECT_ID,
-        location: LOCATION,
-      });
-
+      var expected = `projects/${PROJECT_ID}/locations/${LOCATION}`;
       var formatted = Cluster.getLocation_(PROJECT_ID, LOCATION);
       assert.strictEqual(formatted, expected);
     });
 
     it('should format the location name for project name with /', function() {
       var PROJECT_NAME = 'projects/grape-spaceship-123';
-      var expected = format('projects/{project}/locations/{location}', {
-        project: PROJECT_NAME.split('/').pop(),
-        location: LOCATION,
-      });
-
+      var expected = `projects/${PROJECT_NAME.split(
+        '/'
+      ).pop()}/locations/${LOCATION}`;
       var formatted = Cluster.getLocation_(PROJECT_NAME, LOCATION);
       assert.strictEqual(formatted, expected);
     });
 
     it('should not re-format a complete location', function() {
-      var complete = format('projects/p/locations/{location}', {
-        location: LOCATION,
-      });
-
+      var complete = `projects/p/locations/${LOCATION}`;
       var formatted = Cluster.getLocation_(PROJECT_ID, complete);
       assert.strictEqual(formatted, complete);
     });

handwritten/bigtable/test/family.js

@@ -18,7 +18,6 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var format = require('string-format-obj');
 var proxyquire = require('proxyquire');
 const {util} = require('@google-cloud/common-grpc');
 
@@ -41,11 +40,7 @@ describe('Bigtable/Family', function() {
     createFamily: util.noop,
   };
 
-  var FAMILY_NAME = format('{t}/columnFamilies/{f}', {
-    t: TABLE.name,
-    f: FAMILY_ID,
-  });
-
+  var FAMILY_NAME = `${TABLE.name}/columnFamilies/${FAMILY_ID}`;
   var Family;
   var family;
   var FamilyError;

handwritten/bigtable/test/instance.js

@@ -19,7 +19,6 @@
 var assert = require('assert');
 const common = require('@google-cloud/common-grpc');
 var extend = require('extend');
-var format = require('string-format-obj');
 var proxyquire = require('proxyquire');
 
 var AppProfile = require('../src/app-profile.js');
@@ -66,11 +65,7 @@ describe('Bigtable/Instance', function() {
   var INSTANCE_ID = 'my-instance';
   var BIGTABLE = {projectName: 'projects/my-project'};
 
-  var INSTANCE_NAME = format('{project}/instances/{instance}', {
-    project: BIGTABLE.projectName,
-    instance: INSTANCE_ID,
-  });
-
+  var INSTANCE_NAME = `${BIGTABLE.projectName}/instances/${INSTANCE_ID}`;
   var APP_PROFILE_ID = 'my-app-profile';
   var CLUSTER_ID = 'my-cluster';