Add support for Ember Test registered waiters to wait helper

emberjs · Jan 19, 2016 · d3270ac · d3270ac
1 parent 474be00
commit d3270ac
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/lib/ember-test-helpers/wait.js b/lib/ember-test-helpers/wait.js
@@ -31,6 +31,7 @@ export default function wait(_options) {
   var options = _options || {};
   var waitForTimers = options.hasOwnProperty('waitForTimers') ? options.waitForTimers : true;
   var waitForAJAX = options.hasOwnProperty('waitForAJAX') ? options.waitForAJAX : true;
+  var waitForWaiters = options.hasOwnProperty('waitForWaiters') ? options.waitForWaiters : true;
 
   return new Ember.RSVP.Promise(function(resolve) {
     var watcher = self.setInterval(function() {
@@ -42,6 +43,10 @@ export default function wait(_options) {
         return;
       }
 
+      if (waitForWaiters && (Ember.Test.waiters && Ember.Test.waiters.any(([context, callback]) => !callback.call(context)))) {
+        return;
+      }
+
       // Stop polling
       self.clearInterval(watcher);
 

diff --git a/tests/wait-test.js b/tests/wait-test.js
@@ -93,6 +93,35 @@ moduleForComponent('wait helper tests', {
 
     this.register('template:components/x-test-4', Ember.Handlebars.compile("{{internalValue}}"));
 
+    this.register('component:x-test-5', Ember.Component.extend({
+      internalValue: 'initial value',
+
+      ready: false,
+
+      isReady() {
+        return this.get('ready');
+      },
+
+      init() {
+        this._super.apply(this, arguments);
+        Ember.Test.registerWaiter(this, this.isReady);
+        Ember.run.later(() => {
+          this.setProperties({
+            internalValue: 'async value',
+            ready: true
+          });
+        }, 25);
+      },
+
+      willDestroy() {
+        this._super.apply(this, arguments);
+        Ember.Test.unregisterWaiter(this, this.isReady);
+      }
+
+    }));
+
+    this.register('template:components/x-test-5', Ember.Handlebars.compile('{{internalValue}}'));
+
     this.server = new Pretender(function() {
       this.get('/whazzits', function() {
         return [
@@ -186,3 +215,12 @@ test('it can wait only for timers', function() {
       equal(testContext.$().text(), 'Local Data!' );
     });
 });
+
+test('it waits for Ember test waiters', function() {
+  this.render('{{x-test-5}}');
+
+  return wait({ waitForTimers: false })
+    .then(() => {
+      equal(this.$().text(), 'async value');
+    });
+});