From b12d6546afba081a1fd64877daaf30b68efba618 Mon Sep 17 00:00:00 2001
From: Olivier Gonzalez <ogonzalez@gitlab.com>
Date: Thu, 3 May 2018 08:25:22 +0000
Subject: [PATCH] Add pass through to stripHtml for undefined and null inputs

---
 app/assets/javascripts/lib/utils/text_utility.js | 6 +++++-
 spec/javascripts/lib/utils/text_utility_spec.js  | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js
index b54ecd2d543..5e786ee6935 100644
--- a/app/assets/javascripts/lib/utils/text_utility.js
+++ b/app/assets/javascripts/lib/utils/text_utility.js
@@ -74,7 +74,11 @@ export function capitalizeFirstCharacter(text) {
  * @param {*} replace
  * @returns {String}
  */
-export const stripHtml = (string, replace = '') => string.replace(/<[^>]*>/g, replace);
+export const stripHtml = (string, replace = '') => {
+  if (!string) return string;
+
+  return string.replace(/<[^>]*>/g, replace);
+};
 
 /**
  * Converts snake_case string to camelCase
diff --git a/spec/javascripts/lib/utils/text_utility_spec.js b/spec/javascripts/lib/utils/text_utility_spec.js
index ae00fb76714..eab5c24406a 100644
--- a/spec/javascripts/lib/utils/text_utility_spec.js
+++ b/spec/javascripts/lib/utils/text_utility_spec.js
@@ -75,6 +75,14 @@ describe('text_utility', () => {
         'This is a text with  html .',
       );
     });
+
+    it('passes through with null string input', () => {
+      expect(textUtils.stripHtml(null, ' ')).toEqual(null);
+    });
+
+    it('passes through with undefined string input', () => {
+      expect(textUtils.stripHtml(undefined, ' ')).toEqual(undefined);
+    });
   });
 
   describe('convertToCamelCase', () => {