Removing warnings when running the test and fix a bug when warnings are disabled and non-objects are passed as arguments

lib/index.js

@@ -9,11 +9,11 @@ module.exports = {
   },
 
   convert: function convert(data, options) {
+    if (options === undefined) {
+      options = {};
+    }
+    options = this._merge_options(this._defaults, options);
     if ((typeof data === "undefined" ? "undefined" : _typeof(data)) === 'object') {
-      if (options === undefined) {
-        options = {};
-      }
-      options = this._merge_options(this._defaults, options);
       var result = "?";
       Object.keys(data).map(function (query_key) {
         var query_data = data[query_key];
@@ -50,8 +50,8 @@ module.exports = {
     } else {
       if (options.warn_on_invalid) {
         console.warn("Attempted to convert non-object to query string!");
-        return "";
       }
+      return "";
     }
   },
 

spec/js-query-error-spec.js

@@ -9,7 +9,7 @@ describe("Object -> Query String W/ Errors", function () {
       },
       s: Symbol("foo")
     };
-    expect(querify.convert(qs_object, { warn_on_invalid: true })).toBe("");
+    expect(querify.convert(qs_object)).toBe("");
   });
 
   it("Should fail for nulls", function () {
@@ -17,7 +17,7 @@ describe("Object -> Query String W/ Errors", function () {
       str: "mystr",
       second_str: null
     };
-    expect(querify.convert(qs_object, { warn_on_invalid: true })).toBe("?str=mystr");
+    expect(querify.convert(qs_object)).toBe("?str=mystr");
   });
 
   it("Should fail for undefined", function () {
@@ -25,16 +25,16 @@ describe("Object -> Query String W/ Errors", function () {
       str: "a string",
       second_str: undefined
     };
-    expect(querify.convert(qs_object, { warn_on_invalid: true })).toBe("?str=a%20string");
+    expect(querify.convert(qs_object)).toBe("?str=a%20string");
   });
 
   it("Should fail when trying to use non-objects", function () {
     var qs_object = "str";
     var qs_object2 = 2;
     var qs_object3 = function () { console.log("Hello World!"); };
-    expect(querify.convert(qs_object, { warn_on_invalid: true })).toBe("");
-    expect(querify.convert(qs_object2, { warn_on_invalid: true })).toBe("");
-    expect(querify.convert(qs_object3, { warn_on_invalid: true })).toBe("");
+    expect(querify.convert(qs_object)).toBe("");
+    expect(querify.convert(qs_object2)).toBe("");
+    expect(querify.convert(qs_object3)).toBe("");
   });
 
 });

src/index.js

@@ -6,11 +6,11 @@ module.exports = {
   },
 
   convert: function (data, options) {
+    if (options === undefined) {
+      options = {};
+    }
+    options = this._merge_options(this._defaults, options);
     if (typeof data === 'object') {
-      if (options === undefined) {
-        options = {};
-      }
-      options = this._merge_options(this._defaults, options);
       let result = "?";
       Object.keys(data).map(function (query_key) {
         let query_data = data[query_key];
@@ -47,8 +47,8 @@ module.exports = {
     } else {
       if (options.warn_on_invalid) {
         console.warn("Attempted to convert non-object to query string!");
-        return "";
       }
+      return "";
     }
   },