Merge pull request #1046 from manixate/patch-1

jamuhl · web-flow · commit e04362ace5d9 · 2018-04-19T09:04:13.000+02:00
Remove unnecessary warning when value is empty string
diff --git a/src/Interpolator.js b/src/Interpolator.js
@@ -92,15 +92,16 @@ class Interpolator {
     // regular escape on demand
     while (match = this.regexp.exec(str)) {
       value = handleFormat(match[1].trim());
-      if (typeof value !== 'string') value = utils.makeString(value);
-      if (!value) {
+      if (value === undefined) {
         if (typeof this.options.missingInterpolationHandler === 'function') {
           const temp = this.options.missingInterpolationHandler(str, match);
           value = typeof temp === 'string' ? temp : '';
         } else {
           this.logger.warn(`missed to pass in variable ${match[1]} for interpolating ${str}`);
           value = '';
         }
+      } else if (typeof value !== 'string') {
+        value = utils.makeString(value);
       }
       value = this.escapeValue ? regexSafe(this.escape(value)) : regexSafe(value);
       str = str.replace(match[0], value);
diff --git a/test/interpolation.spec.js b/test/interpolation.spec.js
@@ -252,7 +252,7 @@ describe('Interpolator', () => {
     });
   });
 
-  describe("interpolate() - with missing interpolation value", () => {
+  describe("interpolate() - with undefined interpolation value", () => {
     var ip;
     var tests = [
       {args: ['{{test}}'], expected: ''},
@@ -275,7 +275,7 @@ describe('Interpolator', () => {
     });
   });
 
-  describe("interpolate() - with missing interpolation value - filled by missingInterpolationHandler", () => {
+  describe("interpolate() - with undefined interpolation value - filled by missingInterpolationHandler", () => {
     var ip;
     var tests = [
       {args: ['{{test}}'], expected: 'test'},
@@ -298,4 +298,25 @@ describe('Interpolator', () => {
       });
     });
   });
+
+  describe("interpolate() - with null interpolation value - not filled by missingInterpolationHandler", () => {
+    var ip;
+    var tests = [
+      {args: ['{{test}}', {test: null}], expected: ''},
+    ];
+
+    before(() => {
+      ip = new Interpolator({
+        missingInterpolationHandler: (str, match) => {
+          return 'test'
+        }
+      });
+    });
+
+    tests.forEach((test) => {
+      it('correctly interpolates for ' + JSON.stringify(test.args) + ' args', () => {
+        expect(ip.interpolate.apply(ip, test.args)).to.eql(test.expected);
+      });
+    });
+  });
 });
