setSubstitutions and reverseMergeSubstitutions should accept null

sendgrid · Aug 25, 2017 · 3d0090f · 3d0090f · adamreisnz · Aug 25, 2017
1 parent 74e3270
commit 3d0090f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/helpers/classes/personalization.js b/packages/helpers/classes/personalization.js
@@ -221,7 +221,7 @@ class Personalization {
     if (typeof substitutions === 'undefined') {
       return;
     }
-    if (typeof substitutions !== 'object' || substitutions === null) {
+    if (typeof substitutions !== 'object') {
       throw new Error('Object expected for `substitutions`');
     }
     this.substitutions = substitutions;
@@ -247,8 +247,8 @@ class Personalization {
     if (typeof substitutions === 'undefined') {
       return;
     }
-    if (typeof substitutions !== 'object' || substitutions === null) {
-      throw new Error('Object expected for `substitutions`');
+    if (typeof substitutions !== 'object') {
+      throw new Error('Object expected for `substitutions` in reverseMergeSubstitutions');
     }
     this.substitutions = Object.assign({}, substitutions, this.substitutions);
   }

diff --git a/packages/helpers/classes/personalization.spec.js b/packages/helpers/classes/personalization.spec.js
@@ -406,11 +406,11 @@ describe('Personalization', function() {
     });
     it('should throw an error for invalid input', function() {
       expect(function() {
-        p.setSubstitutions('Invalid');
-      }).to.throw(Error);
-      expect(function() {
-        p.setSubstitutions(null);
+        p.setSubstitutions(3);
       }).to.throw(Error);
+      //expect(function() {
+        //p.setSubstitutions(null);
+      //}).to.throw(Error);
     });
     it('should accept no input', function() {
       expect(function() {
@@ -480,9 +480,9 @@ describe('Personalization', function() {
       expect(function() {
         p.reverseMergeSubstitutions(3);
       }).to.throw(Error);
-      expect(function() {
-        p.reverseMergeSubstitutions(null);
-      }).to.throw(Error);
+      //expect(function() {
+        //p.reverseMergeSubstitutions(null);
+      //}).to.throw(Error);
     });
     it('should accept no input', function() {
       expect(function() {

diff --git a/packages/mail/USE_CASES.md b/packages/mail/USE_CASES.md
@@ -224,7 +224,7 @@ I hope you are having a great day in -city- :)
 ```js
 const sgMail = require('@sendgrid/mail');
 sgMail.setApiKey(process.env.SENDGRID_API_KEY);
-sgMail.setSubstitutionWrappers('-', '-'); // Configure the substitution tag wrappers globally
+sgMail.setSubstitutionWrappers('{{', '}}'); // Configure the substitution tag wrappers globally
 const msg = {
   to: 'recipient@example.org',
   from: 'sender@example.org',
@@ -245,7 +245,7 @@ Alternatively, you may specify the substitution wrappers via the msg object as w
 ```js
 const msg = {
   ...
-  substitutionWrappers: ['-', '-'],
+  substitutionWrappers: ['{{', '}}'],
   ...
 };
 ```