Use canInvoke

adopted-ember-addons · Jan 7, 2017 · 1b0c17d · 1b0c17d
1 parent 815818a
commit 1b0c17d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/addon/format.js b/addon/format.js
@@ -13,6 +13,7 @@ const {
   isEmpty,
   assert,
   deprecate,
+  canInvoke,
   getProperties
 } = Ember;
 
@@ -68,7 +69,7 @@ export default function validateFormat(value, options, model, attribute) {
     set(options, 'regex', regex);
   }
 
-  if ((isNone(value) || typeof value !== 'string') || (regex && isEmpty(value.match(regex)))) {
+  if (!canInvoke(value, 'match') || (regex && isEmpty(value.match(regex)))) {
     return validationError(type || 'invalid', value, options);
   }
 

diff --git a/tests/unit/validators/format-test.js b/tests/unit/validators/format-test.js
@@ -60,6 +60,9 @@ test('email', function(assert) {
     '[email protected]'
   ];
   let invalidAddresses = [
+    null,
+    undefined,
+    404,
     'plainaddress',
     '#@%^%#$@#$@#.com',
     '@domain.com',