always send merchantId to cpnw if not undefined

paypal · Oct 9, 2023 · 8c33c2f · 8c33c2f
1 parent 4ded2eb
commit 8c33c2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/library/zoid/message/validation.js b/src/library/zoid/message/validation.js
@@ -74,9 +74,8 @@ export default {
                 const isInvalid = merchantId.split(',').some(id => id.length !== 13 && id.length !== 10);
                 if (isInvalid) {
                     logInvalid('merchantId', 'Ensure the correct Merchant ID has been entered.');
-                } else {
-                    return merchantId;
                 }
+                return merchantId;
             }
         }
         return undefined;

diff --git a/tests/unit/spec/src/zoid/message/validation.test.js b/tests/unit/spec/src/zoid/message/validation.test.js
@@ -62,7 +62,7 @@ describe('validate', () => {
 
         merchantId = validate.merchantId({ props: { merchantId: 'DEV00000000,DEV00000001NI' } });
 
-        expect(merchantId).toBeUndefined();
+        expect(merchantId).toEqual(merchantId);
         expect(console.warn).toHaveBeenCalledTimes(1);
         expect(console.warn).toHaveBeenLastCalledWith(
             expect.stringContaining('invalid_option_value'),
@@ -71,7 +71,7 @@ describe('validate', () => {
 
         merchantId = validate.merchantId({ props: { merchantId: 'client-id:test_client_id' } });
 
-        expect(merchantId).toBeUndefined();
+        expect(merchantId).toEqual(merchantId);
         expect(console.warn).toHaveBeenCalledTimes(1);
         expect(console.warn).toHaveBeenLastCalledWith(
             expect.stringContaining('invalid_option_value'),