Close #54 | Fix mOcKiNgCaSe.config overridedDefaultOptions (#57)

* merging default options with override options, fixed typo in tests * prettier formatted
strdr4605 · Sep 8, 2019 · 5f10cf6 · 5f10cf6
1 parent 2b8db96
commit 5f10cf6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -68,7 +68,7 @@ mOcKiNgCaSe.log = (input, options) => console.log(mOcKiNgCaSe(input, options));
  * @return mOcKiNgCaSe with default options
  */
 mOcKiNgCaSe.config = defaultOptions => (input = "", overridedDefaultOptions) => {
-  const options = overridedDefaultOptions || defaultOptions;
+  const options = Object.assign(defaultOptions || {}, overridedDefaultOptions || {});
   return mOcKiNgCaSe(input, options);
 };
 

diff --git a/mockingcase.test.js b/mockingcase.test.js
@@ -132,23 +132,40 @@ describe("mockingcase", () => {
     });
   });
 
-  describe("default options when importing/requering package", () => {
+  describe("default options when importing/requiring package", () => {
     test("default options", () => {
-      const mOcKiNgCaSe = require("./index").config({ onlyLetters: true });
+      const mOcKiNgCaSe = require("./index").config({
+        onlyLetters: true,
+      });
       const input = "hello123";
       const expectedOutput = "hElLo";
       expect(mOcKiNgCaSe(input)).toEqual(expectedOutput);
     });
 
     test("override default options", () => {
-      const mOcKiNgCaSe = require("./index").config({ onlyLetters: true });
+      const mOcKiNgCaSe = require("./index").config({
+        onlyLetters: true,
+      });
       const input = "hello123";
       const options = {
         onlyLetters: false,
       };
       const expectedOutput = "hElLo123";
       expect(mOcKiNgCaSe(input, options)).toEqual(expectedOutput);
     });
+
+    test("overriding default options should keep unaffected defaults", () => {
+      const mOcKiNgCaSe = require("./index").config({
+        onlyLetters: true,
+        firstUpper: true,
+      });
+      const input = "hello123";
+      const options = {
+        onlyLetters: false,
+      };
+      const expectedOutput = "HeLlO123";
+      expect(mOcKiNgCaSe(input, options)).toEqual(expectedOutput);
+    });
   });
 
   describe("default input", () => {
@@ -158,7 +175,9 @@ describe("mockingcase", () => {
     });
 
     test("For config option if the input is undefined, an error should be thrown", () => {
-      const mOcKiNgCaSe = require("./index").config({ onlyLetters: true });
+      const mOcKiNgCaSe = require("./index").config({
+        onlyLetters: true,
+      });
       const input = undefined;
       const options = {
         onlyLetters: false,