Merge pull request #18255 from evanxd/bug-988516

Bug 988516 - [Calendar] Intermittent failing test, day view events longer than 2h click after first hour

apps/calendar/test/marionette/day_view_test.js

@@ -31,15 +31,12 @@ marionette('day view', function() {
       app.day.waitForDisplay();
     });
 
-    // disabled bug 988516
-    test.skip('click after first hour', function() {
-      // click will happen at middle of element and middle is after first hour,
-      // so this should be enough to trigger the event details (Bug 972666)
+    test('click after first hour', function() {
       app.day.events[0].click();
       app.readEvent.waitForDisplay();
 
       assert.equal(
-        app.readEvent.title,
+        app.readEvent.waitForTextNotEmpty('title'),
         'Lorem Ipsum',
         'title should match'
       );

apps/calendar/test/marionette/lib/views/view.js

@@ -49,6 +49,22 @@ View.prototype = {
     }.bind(this));
   },
 
+  /**
+   * Wait for the element's text in the getter is not empty,
+   * and then return the text.
+   *
+   * @param {String} getter id.
+   * @return {String} element's text.
+   */
+  waitForTextNotEmpty: function(getter) {
+    var text;
+    this.client.waitFor(function() {
+      text = this[getter];
+      return text !== '';
+    }.bind(this));
+    return text;
+  },
+
   /* Form helpers */
 
   setFormValue: function(name, value) {