From 0ba547cd3c03dae16904a2dde2027432772d9546 Mon Sep 17 00:00:00 2001
From: Alexander Sorokin <alexander.sorokin@akvelon.com>
Date: Thu, 21 Apr 2016 14:16:47 +0300
Subject: [PATCH] CB-11128 Appum tests: Fixed some of the flaky failures

---
 appium-tests/android/android.spec.js | 45 +++++++++++++++++-----------
 appium-tests/ios/ios.spec.js         |  4 +--
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/appium-tests/android/android.spec.js b/appium-tests/android/android.spec.js
index a011941..772ce6e 100644
--- a/appium-tests/android/android.spec.js
+++ b/appium-tests/android/android.spec.js
@@ -1,5 +1,5 @@
 /*jshint node: true, jasmine: true */
-/* global navigator, Q */
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -114,11 +114,23 @@ describe('Camera tests Android.', function () {
                         options.sourceType === cameraConstants.PictureSourceType.SAVEDPHOTOALBUM)) {
                     var tapTile = new wd.TouchAction();
                     var swipeRight = new wd.TouchAction();
-                    tapTile.tap({x: Math.round(screenWidth / 4), y: Math.round(screenHeight / 5)});
-                    swipeRight.press({x: 10, y: 100})
+                    tapTile
+                        .tap({
+                            x: Math.round(screenWidth / 4),
+                            y: Math.round(screenHeight / 5)
+                        });
+                    swipeRight
+                        .press({x: 10, y: 100})
                         .wait(300)
-                        .moveTo({x: Math.round(screenWidth / 2), y: 100})
-                        .release();
+                        .moveTo({x: Math.round(screenWidth / 2), y: 0})
+                        .release()
+                        .wait(1000);
+                    if (options.allowEdit) {
+                        return driver
+                            // always wait before performing touchAction
+                            .sleep(7000)
+                            .performTouchAction(tapTile);
+                    }
                     return driver
                         .elementByXPath('//android.widget.TextView[@text="Gallery"]')
                         .fail(function () {
@@ -126,17 +138,9 @@ describe('Camera tests Android.', function () {
                                 .performTouchAction(swipeRight)
                                 .elementByXPath('//android.widget.TextView[@text="Gallery"]');
                         })
-                        .then(function (element) {
-                            return element
-                                .click()
-                                // we need to sleep here to give a sidebar some time to close
-                                // if we don't sleep here, sometimes we would click on a sidebar
-                                // in the next step
-                                .sleep(3000);
-                        }, function () {
-                            // the gallery is already opened, just go on:
-                            return driver;
-                        })
+                        .click()
+                        // always wait before performing touchAction
+                        .sleep(7000)
                         .performTouchAction(tapTile);
                 }
                 // taking a picture from camera
@@ -156,7 +160,10 @@ describe('Camera tests Android.', function () {
                         .click();
                 }
             })
-            .fail(fail);
+            .fail(function (failure) {
+                console.log(failure);
+                fail(failure);
+            });
     }
 
     // checks if the picture was successfully taken
@@ -197,6 +204,8 @@ describe('Camera tests Android.', function () {
         var holdTile = new wd.TouchAction();
         holdTile.press({x: Math.round(screenWidth / 4), y: Math.round(screenHeight / 5)}).wait(1000).release();
         return driver
+            // always wait before performing touchAction
+            .sleep(7000)
             .performTouchAction(holdTile)
             .elementByXPath('//android.widget.TextView[@text="Delete"]')
             .then(function (element) {
@@ -407,5 +416,5 @@ describe('Camera tests Android.', function () {
         driver
             .quit()
             .done(done);
-    }, MINUTE);
+    }, 5 * MINUTE);
 });
diff --git a/appium-tests/ios/ios.spec.js b/appium-tests/ios/ios.spec.js
index 27644ef..186bbd9 100644
--- a/appium-tests/ios/ios.spec.js
+++ b/appium-tests/ios/ios.spec.js
@@ -1,5 +1,5 @@
 /*jshint node: true, jasmine: true */
-/* global navigator, Q */
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -260,5 +260,5 @@ describe('Camera tests iOS.', function () {
         driver
             .quit()
             .done(done);
-    }, MINUTE);
+    }, 5 * MINUTE);
 });