zhaidi/cordova-plugin-camera-dev
zhaidi/cordova-plugin-camera-dev
1
0
Fork 0
forked from public/cordova-plugin-camera
Code Pull Requests Activity

CB-11128 Appum tests: Fixed some of the flaky failures

Browse Source
This commit is contained in:
Alexander Sorokin 2016-04-21 14:16:47 +03:00
parent 6d058fe9e7
commit 0ba547cd3c
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
appium-tests/android/android.spec.js
View File

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

4
appium-tests/ios/ios.spec.js
View File

@ -1,5 +1,5 @@
/*jshint node: true, jasmine: true */ /*jshint node: true, jasmine: true */
/* global navigator, Q */
/* /*
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -260,5 +260,5 @@ describe('Camera tests iOS.', function () {
driver driver
.quit() .quit()
.done(done); .done(done);
}, MINUTE); }, 5 * MINUTE);
}); });