style

Author: stephenplusplus

packages/common/test/index.js

@@ -52,7 +52,6 @@ describe('common', function() {
       GrpcService: fakeGrpcService,
       GrpcServiceObject: fakeGrpcServiceObject,
       logger: fakeLogger,
-      Metadata: fakeMetadata,
       Operation: fakeOperation,
       paginator: fakePaginator,
       Service: fakeService,

packages/common/test/paginator.js

@@ -24,12 +24,10 @@ var through = require('through2');
 var uuid = require('uuid');
 
 var paginator = require('../src/paginator.js');
-var util = require('../src/util.js');
+var util = extend({}, require('../src/util.js'));
 
 var overrides = {};
 
-// Makes the given object's member functions overridable by mutating a field
-// in overrides.
 function override(name, object) {
   var cachedObject = extend({}, object);
   overrides[name] = {};
@@ -48,23 +46,9 @@ function override(name, object) {
 
       return cachedObject[methodName].apply(this, args);
     };
-
-    object[methodName].unoverride_ = function() {
-      object[methodName] = cachedObject[methodName];
-    };
-  });
-}
-
-// Reverses the override function.
-function unoverride(object) {
-  Object.keys(object).forEach(function(methodName) {
-    if (object[methodName].unoverride_) {
-      object[methodName].unoverride_();
-    }
   });
 }
 
-// Resets all overridden functions.
 function resetOverrides() {
   overrides = Object.keys(overrides).reduce(function(acc, name) {
     acc[name] = {};
@@ -91,9 +75,7 @@ describe('paginator', function() {
   });
 
   after(function() {
-    // Set each function in each overridden module to its original value
-    unoverride(util);
-    unoverride(paginator);
+    resetOverrides();
   });
 
   describe('extend', function() {

packages/common/test/util.js

@@ -79,10 +79,6 @@ describe('common/util', function() {
         return (utilOverrides[utilMethod] || utilCached[utilMethod])
           .apply(this, arguments);
       };
-
-      util[utilMethod].unoverride_ = function() {
-        util[utilMethod] = utilCached[utilMethod];
-      };
     });
 
     duplexify = require('duplexify');
@@ -96,15 +92,6 @@ describe('common/util', function() {
     utilOverrides = {};
   });
 
-  after(function() {
-    // Set each function in util to its original value
-    Object.keys(util).forEach(function(utilMethod) {
-      if (util[utilMethod].unoverride_) {
-        util[utilMethod].unoverride_();
-      }
-    });
-  });
-
   it('should have set correct defaults on Request', function() {
     assert.deepEqual(REQUEST_DEFAULT_CONF, {
       timeout: 60000,