From c12edf5cddc24205e8497e6b49b88ad8d3ef3cb3 Mon Sep 17 00:00:00 2001
From: Miller Medeiros <miller@millermedeiros.com>
Date: Wed, 5 Mar 2014 14:32:42 -0300
Subject: [PATCH] Bug 979969 - [Calendar] calendar.isViewActive should check if
 element is really "active" on the marionette tests

---
 apps/calendar/test/marionette/calendar.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/test/marionette/calendar.js b/apps/calendar/test/marionette/calendar.js
index 6d953d74b..58d126c6d 100644
--- a/apps/calendar/test/marionette/calendar.js
+++ b/apps/calendar/test/marionette/calendar.js
@@ -23,6 +23,14 @@ Calendar.ORIGIN = 'app://calendar.gaiamobile.org';
  * @type {Object}
  */
 Calendar.Selector = Object.freeze({
+  // main view elements, used by waitForView
+  day: '#day-view',
+  week: '#week-view',
+  month: '#month-view',
+  'event/show': '#event-view',
+  'event/add': '#modify-event-view.create',
+  'event/edit': '#modify-event-view.update',
+
   addAccountPasswordInput: '#modify-account-view input[name="password"]',
   addAccountSaveButton: '#modify-account-view button.save',
   addAccountUrlInput: '#modify-account-view input[name="fullUrl"]',
@@ -307,13 +315,21 @@ Calendar.prototype = {
    * @return {boolean} Whether or not view is active
    */
   isViewActive: function(id) {
-    id = id || '';
+    return this._isPath(id) && this._isElementActive(id);
+  },
+
+  _isPath: function(id) {
     // we do not use the URL since that might happen before the [data-path] is
     // updated and styles/views are toggled based on [data-path]
     var path = this.client.findElement('body').getAttribute('data-path');
     return path.indexOf(id) !== -1;
   },
 
+  _isElementActive: function(id) {
+    return this.findElement(id)
+      .getAttribute('class').indexOf('active') !== -1;
+  },
+
   /**
    * @return {boolean} Whether or not week view is active
    */