Normalize arguments when using new. (#19)

Author: stephenplusplus

packages/google-cloud-dns/src/index.js

@@ -80,10 +80,11 @@ var Zone = require('./zone.js');
  */
 function DNS(options) {
   if (!(this instanceof DNS)) {
-    options = common.util.normalizeArguments(this, options);
     return new DNS(options);
   }
 
+  options = common.util.normalizeArguments(this, options);
+
   var config = {
     baseUrl: 'https://www.googleapis.com/dns/v1',
     scopes: [

packages/google-cloud-dns/test/index.js

@@ -60,6 +60,7 @@ var fakeUtil = extend({}, util, {
     assert.deepEqual(options.exclude, ['zone']);
   },
 });
+var originalFakeUtil = extend(true, {}, fakeUtil);
 
 function FakeZone() {
   this.calledWith_ = arguments;
@@ -83,6 +84,7 @@ describe('DNS', function() {
   });
 
   beforeEach(function() {
+    extend(fakeUtil, originalFakeUtil);
     dns = new DNS({
       projectId: PROJECT_ID,
     });
@@ -101,23 +103,24 @@ describe('DNS', function() {
       assert(promisified);
     });
 
+    it('should work without new', function() {
+      assert.doesNotThrow(function() {
+        DNS({projectId: PROJECT_ID});
+      });
+    });
+
     it('should normalize the arguments', function() {
-      var normalizeArguments = fakeUtil.normalizeArguments;
       var normalizeArgumentsCalled = false;
-      var fakeOptions = {projectId: PROJECT_ID};
-      var fakeContext = {};
+      var options = {};
 
-      fakeUtil.normalizeArguments = function(context, options) {
+      fakeUtil.normalizeArguments = function(context, options_) {
         normalizeArgumentsCalled = true;
-        assert.strictEqual(context, fakeContext);
-        assert.strictEqual(options, fakeOptions);
-        return options;
+        assert.strictEqual(options_, options);
+        return options_;
       };
 
-      DNS.call(fakeContext, fakeOptions);
-      assert(normalizeArgumentsCalled);
-
-      fakeUtil.normalizeArguments = normalizeArguments;
+      new DNS(options);
+      assert.strictEqual(normalizeArgumentsCalled, true);
     });
 
     it('should inherit from Service', function() {