Replace private and deprecated _lookupFactory with public & perform…

…ant `factoryFor`
adopted-ember-addons · Jan 24, 2017 · 6a99cb8 · 6a99cb8
1 parent 429647e
commit 6a99cb8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/addon/validations/factory.js b/addon/validations/factory.js
@@ -738,7 +738,13 @@ function createValidatorsFor(attribute, model) {
  * @return {Class} Validator class or undefined if not found
  */
 function lookupValidator(owner, type) {
-  let validatorClass = owner._lookupFactory(`validator:${type}`);
+  let validatorClass;
+  if (owner.factoryFor) {
+    let maybeValidatorClass = owner.factoryFor(`validator:${type}`);
+    validatorClass = maybeValidatorClass && maybeValidatorClass.class;
+  } else {
+    validatorClass = owner._lookupFactory(`validator:${type}`);
+  }
 
   if (isNone(validatorClass)) {
     throw new Error(`[ember-cp-validations] Validator not found of type: ${type}.`);

diff --git a/addon/validators/base.js b/addon/validators/base.js
@@ -88,7 +88,12 @@ const Base = Ember.Object.extend({
 
     if (!isNone(owner)) {
       // Since default error messages are stored in app/validators/messages, we have to look it up via the owner
-      errorMessages = owner._lookupFactory('validator:messages');
+      if (owner.factoryFor) {
+        let maybeErrorMessages = owner.factoryFor('validator:messages');
+        errorMessages = maybeErrorMessages && maybeErrorMessages.class;
+      } else {
+        errorMessages = owner._lookupFactory('validator:messages');
+      }
     }
 
     // If for some reason, we can't find the messages object (i.e. unit tests), use default