Tests added for revalidators

addon/mixins/components/conditional-validations.js

@@ -13,12 +13,12 @@ export default Ember.Mixin.create({
     }
   },
 
-  willDestroyElement() {
+  willDestroy() {
     this._super(...arguments);
     this._removeRevalidationObservers();
   },
 
-  willInsertElement() {
+  init() {
     this._super(...arguments);
     this._revalidate();
   },
@@ -29,13 +29,17 @@ export default Ember.Mixin.create({
     Ember.assert('No validate() method detected. You must use the conditional validations mixin with the form mixin.', validateExists);
 
     this.forEachRevalidator((property) => {
-      this.addObserver(property, this.validate);
+      this.addObserver(property, () => {
+        this.validate();
+      });
     });
   },
 
   _removeRevalidationObservers() {
     this.forEachRevalidator((property) => {
-      this.removeObserver(property, this.validate);
+      this.removeObserver(property, () => {
+        this.validate();
+      });
     });
   },
 });

tests/unit/mixins/components/conditional-validations-test.js

@@ -1,12 +1,47 @@
 import Ember from 'ember';
-import ControllersConditionalValidationsMixin from 'ember-easy-form-extensions/mixins/components/conditional-validations';
+import ComponentsConditionalValidationsMixin from 'ember-easy-form-extensions/mixins/components/conditional-validations';
+import ComponentsFormMixin from 'ember-easy-form-extensions/mixins/components/form';
 import { module, test } from 'qunit';
 
-module('Unit | Mixin | controllers/conditional validations');
+let subject;
+
+module('Unit | Mixin | components/conditional validations', {
+
+  beforeEach() {
+    const ComponentsConditionalValidationsObject = Ember.Object.extend(
+      ComponentsFormMixin,
+      ComponentsConditionalValidationsMixin, {
+
+      bananas: null,
+      revalidateFor: ['bananas'],
+    });
+
+    subject = ComponentsConditionalValidationsObject.create();
+  },
+
+});
+
+test('Calls to validate', function(assert) {
+  const done = assert.async();
+
+  assert.expect(3);
+
+  subject.validate = function() {
+    assert.ok(true, 'Validate should be called when bananas changes');
+  }
+
+  assert.ok(subject.hasObserverFor('bananas'), 'Should add observers on init');
+
+  subject.set('bananas', true);
+
+  Ember.run(this, function() {
+    subject.destroy();
+
+
+    Ember.run.next(this, function() {
+      assert.notOk(subject.hasObserverFor('bananas'), 'Should remove observers on destroy');
+      done();
+    });
+  });
 
-// Replace this with your real tests.
-test('it works', function(assert) {
-  let ControllersConditionalValidationsObject = Ember.Object.extend(ControllersConditionalValidationsMixin);
-  let subject = ControllersConditionalValidationsObject.create();
-  assert.ok(subject);
 });