Merge branch 'winh-idempotent-parseboolean' into 'master'

Make parseBoolean idempotent

See merge request gitlab-org/gitlab-ce!24365

2 files changed, 19 insertions, 7 deletions

diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index 93b347ad09b..3b6a57dad44 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -430,13 +430,14 @@ export const historyPushState = newUrl => {
 };
 
 /**
- * Returns true for a String "true" and false otherwise.
- * This is the opposite of Boolean(...).toString()
+ * Returns true for a String value of "true" and false otherwise.
+ * This is the opposite of Boolean(...).toString().
+ * `parseBoolean` is idempotent.
  *
  * @param  {String} value
  * @returns {Boolean}
  */
-export const parseBoolean = value => value === 'true';
+export const parseBoolean = value => (value && value.toString()) === 'true';
 
 /**
  * Converts permission provided as strings to booleans.
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index f320f232687..0dc7e93539a 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -347,20 +347,31 @@ describe('common_utils', () => {
   });
 
   describe('parseBoolean', () => {
+    const { parseBoolean } = commonUtils;
+
     it('returns true for "true"', () => {
-      expect(commonUtils.parseBoolean('true')).toEqual(true);
+      expect(parseBoolean('true')).toEqual(true);
     });
 
     it('returns false for "false"', () => {
-      expect(commonUtils.parseBoolean('false')).toEqual(false);
+      expect(parseBoolean('false')).toEqual(false);
     });
 
     it('returns false for "something"', () => {
-      expect(commonUtils.parseBoolean('something')).toEqual(false);
+      expect(parseBoolean('something')).toEqual(false);
     });
 
     it('returns false for null', () => {
-      expect(commonUtils.parseBoolean(null)).toEqual(false);
+      expect(parseBoolean(null)).toEqual(false);
+    });
+
+    it('is idempotent', () => {
+      const input = ['true', 'false', 'something', null];
+      input.forEach(value => {
+        const result = parseBoolean(value);
+
+        expect(parseBoolean(result)).toBe(result);
+      });
     });
   });