Bug 1023911 - [Contacts] Investigate why integration test contacts_sh…

…ortcuts_test.js is failing
arcturus · Jun 13, 2014 · 8ed8d07 · 8ed8d07
1 parent d20c8ee
commit 8ed8d07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/apps/communications/contacts/test/marionette/contacts_shortcuts_test.js b/apps/communications/contacts/test/marionette/contacts_shortcuts_test.js
@@ -31,9 +31,9 @@ marionette('Contacts shortcuts > touch', function() {
   });
 
   // Disabled bug 1023908
-  suite.skip('touch on shortcuts', function() {
+  suite('touch on shortcuts', function() {
     test('press/release on scrollbar should show/hide shortcut', function() {
-      var action = actions.press(scrollbar, 10, 200).perform();
+      var action = actions.press(scrollbar, 10, 100).perform();
       overlay = client.helper.waitForElement(selectors.overlay);
       assert.equal(overlay.text().length, 1);
       assert.equal(overlayOpacity(), '1');
@@ -67,9 +67,9 @@ marionette('Contacts shortcuts > touch', function() {
 
     test('pressing near the last release position should show valid shortcut',
       function() {
-      actions.press(scrollbar, 10, 200).release().perform();
+      actions.press(scrollbar, 15, 100).release().perform();
 
-      var action = actions.press(scrollbar, 10, 200).perform();
+      var action = actions.press(scrollbar, 15, 100).perform();
       overlay = client.helper.waitForElement(selectors.overlay);
       assert.equal(overlay.text().length, 1);
       action.release().perform();

diff --git a/apps/communications/contacts/test/marionette/lib/contacts.js b/apps/communications/contacts/test/marionette/lib/contacts.js
@@ -151,17 +151,8 @@ Contacts.prototype = {
 
   waitForFormTransition: function() {
     var selectors = Contacts.Selectors,
-        bodyHeight = this.client.findElement(selectors.body).size().height,
         form = this.client.findElement(selectors.form);
-    var test = function() {
-      var location = form.location();
-      // Since only checking form position could not guarantee
-      // the transition is ended, add z-index checking because
-      // it will be removed after transition.
-      var zIndex = this.getElementStyle(selectors.form, 'zIndex');
-      return location.y >= bodyHeight && !zIndex;
-    };
-    this.client.waitFor(test.bind(this));
+    this.client.helper.waitForElementToDisappear(form);
   },
 
   enterContactDetails: function(details) {