mirror of
https://github.com/apache/cordova-plugin-camera.git
synced 2025-03-16 05:51:02 +08:00
CB-12764: (android) Adapt Appium tests for Android 7
This commit is contained in:
parent
51e5c02dcb
commit
1b218cd8a0
@ -63,6 +63,17 @@ describe('Camera tests Android.', function () {
|
|||||||
var isResolutionBad = true;
|
var isResolutionBad = true;
|
||||||
// a path to the image we add to the gallery before test run
|
// a path to the image we add to the gallery before test run
|
||||||
var fillerImagePath;
|
var fillerImagePath;
|
||||||
|
var isAndroid7 = getIsAndroid7();
|
||||||
|
|
||||||
|
function getIsAndroid7() {
|
||||||
|
if (global.USE_SAUCE) {
|
||||||
|
return global.SAUCE_CAPS && (parseFloat(global.SAUCE_CAPS.platformVersion) >= 7);
|
||||||
|
} else {
|
||||||
|
// this is most likely null, meaning we cannot determine if it is Android 7 or not
|
||||||
|
// paramedic needs to be modified to receive and pass the platform version when testing locally
|
||||||
|
return global.PLATFORM_VERSION && (parseFloat(global.PLATFORM_VERSION) >= 7);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function getNextPromiseId() {
|
function getNextPromiseId() {
|
||||||
promiseCount += 1;
|
promiseCount += 1;
|
||||||
@ -155,15 +166,34 @@ describe('Camera tests Android.', function () {
|
|||||||
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*shutter.*")', MINUTE / 2)
|
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*shutter.*")', MINUTE / 2)
|
||||||
.click()
|
.click()
|
||||||
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*done.*")', MINUTE / 2)
|
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*done.*")', MINUTE / 2)
|
||||||
.click();
|
.click()
|
||||||
|
.then(function () {
|
||||||
|
if (isAndroid7 && options.allowEdit) {
|
||||||
|
return driver
|
||||||
|
.elementByAndroidUIAutomator('new UiSelector().text("Crop picture");', 20000)
|
||||||
|
.click()
|
||||||
|
.fail(function () {
|
||||||
|
// don't freak out just yet...
|
||||||
|
return driver;
|
||||||
|
})
|
||||||
|
.elementByAndroidUIAutomator('new UiSelector().text("JUST ONCE");', 20000)
|
||||||
|
.click()
|
||||||
|
.fail(function () {
|
||||||
|
// maybe someone's hit that "ALWAYS" button?
|
||||||
|
return driver;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return driver;
|
||||||
|
});
|
||||||
})
|
})
|
||||||
.then(function () {
|
.then(function () {
|
||||||
if (skipUiInteractions) {
|
if (skipUiInteractions) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (options.allowEdit) {
|
if (options.allowEdit) {
|
||||||
|
var saveText = isAndroid7 ? 'SAVE' : 'Save';
|
||||||
return driver
|
return driver
|
||||||
.waitForElementByAndroidUIAutomator('new UiSelector().text("Save")', MINUTE)
|
.waitForElementByAndroidUIAutomator('new UiSelector().text("' + saveText + '")', MINUTE)
|
||||||
.click();
|
.click();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -181,7 +211,7 @@ describe('Camera tests Android.', function () {
|
|||||||
return driver
|
return driver
|
||||||
.context(webviewContext)
|
.context(webviewContext)
|
||||||
.setAsyncScriptTimeout(MINUTE / 2)
|
.setAsyncScriptTimeout(MINUTE / 2)
|
||||||
.executeAsync(cameraHelper.checkPicture, [getCurrentPromiseId(), options])
|
.executeAsync(cameraHelper.checkPicture, [getCurrentPromiseId(), options, isAndroid7])
|
||||||
.then(function (result) {
|
.then(function (result) {
|
||||||
if (shouldLoad) {
|
if (shouldLoad) {
|
||||||
if (result !== 'OK') {
|
if (result !== 'OK') {
|
||||||
@ -320,9 +350,14 @@ describe('Camera tests Android.', function () {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkCamera(pending) {
|
function checkCamera(options, pending) {
|
||||||
if (!cameraAvailable) {
|
if (!cameraAvailable) {
|
||||||
pending('This test requires a functioning camera on the Android device/emulator, and this test suite\'s functional camera test failed on your target environment.');
|
pending('Skipping because this test requires a functioning camera on the Android device/emulator, and this test suite\'s functional camera test failed on your target environment.');
|
||||||
|
} else if (isAndroid7 && options.allowEdit) {
|
||||||
|
// TODO: Check if it is fixed some day
|
||||||
|
pending('Skipping because can\'t test with allowEdit=true on Android 7: getting unexpected "Camera cancelled" message.');
|
||||||
|
} else if (isAndroid7 && (options.sourceType !== cameraConstants.PictureSourceType.CAMERA)) {
|
||||||
|
pending('Skipping because can\'t click on the gallery tile on Android 7.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -381,15 +416,16 @@ describe('Camera tests Android.', function () {
|
|||||||
describe('Specs.', function () {
|
describe('Specs.', function () {
|
||||||
// getPicture() with saveToPhotoLibrary = true
|
// getPicture() with saveToPhotoLibrary = true
|
||||||
it('camera.ui.spec.1 Saving a picture to the photo library', function (done) {
|
it('camera.ui.spec.1 Saving a picture to the photo library', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
checkCamera(pending);
|
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 50,
|
quality: 50,
|
||||||
allowEdit: false,
|
allowEdit: false,
|
||||||
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
||||||
saveToPhotoAlbum: true
|
saveToPhotoAlbum: true
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
|
||||||
|
var spec = generateSpec(opts);
|
||||||
tryRunSpec(spec)
|
tryRunSpec(spec)
|
||||||
.then(function () {
|
.then(function () {
|
||||||
isTestPictureSaved = true;
|
isTestPictureSaved = true;
|
||||||
@ -421,11 +457,12 @@ describe('Camera tests Android.', function () {
|
|||||||
})
|
})
|
||||||
.then(function () {
|
.then(function () {
|
||||||
// if the gallery is opened on the videos page,
|
// if the gallery is opened on the videos page,
|
||||||
// there should be a "Choose video" caption
|
// there should be a "Choose video" or "Select video" caption
|
||||||
|
var videoSelector = isAndroid7 ? 'new UiSelector().text("Select video")' : 'new UiSelector().text("Choose video")';
|
||||||
return driver
|
return driver
|
||||||
.elementByAndroidUIAutomator('new UiSelector().text("Choose video")')
|
.elementByAndroidUIAutomator(videoSelector)
|
||||||
.fail(function () {
|
.fail(function () {
|
||||||
throw 'Couldn\'t find a "Choose video" element.';
|
throw 'Couldn\'t find a "Choose/select video" element.';
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.deviceKeyEvent(BACK_BUTTON)
|
.deviceKeyEvent(BACK_BUTTON)
|
||||||
@ -463,15 +500,15 @@ describe('Camera tests Android.', function () {
|
|||||||
// getPicture(), then dismiss
|
// getPicture(), then dismiss
|
||||||
// wait for the error callback to be called
|
// wait for the error callback to be called
|
||||||
it('camera.ui.spec.3 Dismissing the camera', function (done) {
|
it('camera.ui.spec.3 Dismissing the camera', function (done) {
|
||||||
|
var options = {
|
||||||
|
quality: 50,
|
||||||
|
allowEdit: true,
|
||||||
|
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
||||||
|
destinationType: cameraConstants.DestinationType.FILE_URI
|
||||||
|
};
|
||||||
checkSession(done);
|
checkSession(done);
|
||||||
checkCamera(pending);
|
checkCamera(options, pending);
|
||||||
var spec = function () {
|
var spec = function () {
|
||||||
var options = {
|
|
||||||
quality: 50,
|
|
||||||
allowEdit: true,
|
|
||||||
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
|
||||||
destinationType: cameraConstants.DestinationType.FILE_URI
|
|
||||||
};
|
|
||||||
return driver
|
return driver
|
||||||
.then(function () {
|
.then(function () {
|
||||||
return getPicture(options, true);
|
return getPicture(options, true);
|
||||||
@ -490,15 +527,15 @@ describe('Camera tests Android.', function () {
|
|||||||
// getPicture(), then take picture but dismiss the edit
|
// getPicture(), then take picture but dismiss the edit
|
||||||
// wait for the error callback to be called
|
// wait for the error callback to be called
|
||||||
it('camera.ui.spec.4 Dismissing the edit', function (done) {
|
it('camera.ui.spec.4 Dismissing the edit', function (done) {
|
||||||
|
var options = {
|
||||||
|
quality: 50,
|
||||||
|
allowEdit: true,
|
||||||
|
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
||||||
|
destinationType: cameraConstants.DestinationType.FILE_URI
|
||||||
|
};
|
||||||
checkSession(done);
|
checkSession(done);
|
||||||
checkCamera(pending);
|
checkCamera(options, pending);
|
||||||
var spec = function () {
|
var spec = function () {
|
||||||
var options = {
|
|
||||||
quality: 50,
|
|
||||||
allowEdit: true,
|
|
||||||
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
|
||||||
destinationType: cameraConstants.DestinationType.FILE_URI
|
|
||||||
};
|
|
||||||
return driver
|
return driver
|
||||||
.then(function () {
|
.then(function () {
|
||||||
return getPicture(options, true);
|
return getPicture(options, true);
|
||||||
@ -507,8 +544,19 @@ describe('Camera tests Android.', function () {
|
|||||||
.click()
|
.click()
|
||||||
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*done.*")', MINUTE / 2)
|
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*done.*")', MINUTE / 2)
|
||||||
.click()
|
.click()
|
||||||
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*discard.*")', MINUTE / 2)
|
.then(function () {
|
||||||
.click()
|
if (isAndroid7 && options.allowEdit) {
|
||||||
|
return driver
|
||||||
|
.waitForElementByAndroidUIAutomator('new UiSelector().text("Crop picture");', 20000)
|
||||||
|
.click()
|
||||||
|
.waitForElementByAndroidUIAutomator('new UiSelector().text("JUST ONCE");', 20000)
|
||||||
|
.click()
|
||||||
|
.deviceKeyEvent(BACK_BUTTON);
|
||||||
|
}
|
||||||
|
return driver
|
||||||
|
.waitForElementByAndroidUIAutomator('new UiSelector().resourceIdMatches(".*discard.*")', MINUTE / 2)
|
||||||
|
.click();
|
||||||
|
})
|
||||||
.then(function () {
|
.then(function () {
|
||||||
return checkPicture(false);
|
return checkPicture(false);
|
||||||
});
|
});
|
||||||
@ -518,53 +566,56 @@ describe('Camera tests Android.', function () {
|
|||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
|
|
||||||
it('camera.ui.spec.5 Verifying target image size, sourceType=CAMERA', function (done) {
|
it('camera.ui.spec.5 Verifying target image size, sourceType=CAMERA', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
checkCamera(pending);
|
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 50,
|
quality: 50,
|
||||||
allowEdit: false,
|
allowEdit: false,
|
||||||
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
||||||
saveToPhotoAlbum: false,
|
saveToPhotoAlbum: false,
|
||||||
targetWidth: 210,
|
targetWidth: 210,
|
||||||
targetHeight: 210
|
targetHeight: 210
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
var spec = generateSpec(opts);
|
||||||
|
|
||||||
tryRunSpec(spec).done(done);
|
tryRunSpec(spec).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
|
|
||||||
it('camera.ui.spec.6 Verifying target image size, sourceType=PHOTOLIBRARY', function (done) {
|
it('camera.ui.spec.6 Verifying target image size, sourceType=PHOTOLIBRARY', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 50,
|
quality: 50,
|
||||||
allowEdit: false,
|
allowEdit: false,
|
||||||
sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
|
sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
|
||||||
saveToPhotoAlbum: false,
|
saveToPhotoAlbum: false,
|
||||||
targetWidth: 210,
|
targetWidth: 210,
|
||||||
targetHeight: 210
|
targetHeight: 210
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
var spec = generateSpec(opts);
|
||||||
|
|
||||||
tryRunSpec(spec).done(done);
|
tryRunSpec(spec).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
|
|
||||||
it('camera.ui.spec.7 Verifying target image size, sourceType=CAMERA, DestinationType=NATIVE_URI', function (done) {
|
it('camera.ui.spec.7 Verifying target image size, sourceType=CAMERA, DestinationType=NATIVE_URI', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
checkCamera(pending);
|
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 50,
|
quality: 50,
|
||||||
allowEdit: false,
|
allowEdit: true,
|
||||||
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
||||||
destinationType: cameraConstants.DestinationType.NATIVE_URI,
|
destinationType: cameraConstants.DestinationType.NATIVE_URI,
|
||||||
saveToPhotoAlbum: false,
|
saveToPhotoAlbum: false,
|
||||||
targetWidth: 210,
|
targetWidth: 210,
|
||||||
targetHeight: 210
|
targetHeight: 210
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
var spec = generateSpec(opts);
|
||||||
|
|
||||||
tryRunSpec(spec).done(done);
|
tryRunSpec(spec).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
|
|
||||||
it('camera.ui.spec.8 Verifying target image size, sourceType=PHOTOLIBRARY, DestinationType=NATIVE_URI', function (done) {
|
it('camera.ui.spec.8 Verifying target image size, sourceType=PHOTOLIBRARY, DestinationType=NATIVE_URI', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 50,
|
quality: 50,
|
||||||
allowEdit: false,
|
allowEdit: false,
|
||||||
sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
|
sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
|
||||||
@ -572,30 +623,33 @@ describe('Camera tests Android.', function () {
|
|||||||
saveToPhotoAlbum: false,
|
saveToPhotoAlbum: false,
|
||||||
targetWidth: 210,
|
targetWidth: 210,
|
||||||
targetHeight: 210
|
targetHeight: 210
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
|
||||||
|
var spec = generateSpec(opts);
|
||||||
tryRunSpec(spec).done(done);
|
tryRunSpec(spec).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
|
|
||||||
it('camera.ui.spec.9 Verifying target image size, sourceType=CAMERA, DestinationType=NATIVE_URI, quality=100', function (done) {
|
it('camera.ui.spec.9 Verifying target image size, sourceType=CAMERA, DestinationType=NATIVE_URI, quality=100', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
checkCamera(pending);
|
quality: 50,
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 100,
|
|
||||||
allowEdit: true,
|
allowEdit: true,
|
||||||
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
sourceType: cameraConstants.PictureSourceType.CAMERA,
|
||||||
destinationType: cameraConstants.DestinationType.NATIVE_URI,
|
destinationType: cameraConstants.DestinationType.NATIVE_URI,
|
||||||
saveToPhotoAlbum: false,
|
saveToPhotoAlbum: false,
|
||||||
targetWidth: 305,
|
targetWidth: 305,
|
||||||
targetHeight: 305
|
targetHeight: 305
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
var spec = generateSpec(opts);
|
||||||
|
|
||||||
tryRunSpec(spec).done(done);
|
tryRunSpec(spec).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
|
|
||||||
it('camera.ui.spec.10 Verifying target image size, sourceType=PHOTOLIBRARY, DestinationType=NATIVE_URI, quality=100', function (done) {
|
it('camera.ui.spec.10 Verifying target image size, sourceType=PHOTOLIBRARY, DestinationType=NATIVE_URI, quality=100', function (done) {
|
||||||
checkSession(done);
|
var opts = {
|
||||||
var spec = generateSpec({
|
|
||||||
quality: 100,
|
quality: 100,
|
||||||
allowEdit: true,
|
allowEdit: true,
|
||||||
sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
|
sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
|
||||||
@ -603,7 +657,10 @@ describe('Camera tests Android.', function () {
|
|||||||
saveToPhotoAlbum: false,
|
saveToPhotoAlbum: false,
|
||||||
targetWidth: 305,
|
targetWidth: 305,
|
||||||
targetHeight: 305
|
targetHeight: 305
|
||||||
});
|
};
|
||||||
|
checkSession(done);
|
||||||
|
checkCamera(opts, pending);
|
||||||
|
var spec = generateSpec(opts);
|
||||||
|
|
||||||
tryRunSpec(spec).done(done);
|
tryRunSpec(spec).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
@ -612,15 +669,17 @@ describe('Camera tests Android.', function () {
|
|||||||
generateOptions().forEach(function (spec) {
|
generateOptions().forEach(function (spec) {
|
||||||
it('camera.ui.spec.11.' + spec.id + ' Combining options. ' + spec.description, function (done) {
|
it('camera.ui.spec.11.' + spec.id + ' Combining options. ' + spec.description, function (done) {
|
||||||
checkSession(done);
|
checkSession(done);
|
||||||
if (spec.options.sourceType == cameraConstants.PictureSourceType.CAMERA) {
|
checkCamera(spec.options, pending);
|
||||||
checkCamera(pending);
|
|
||||||
}
|
|
||||||
var s = generateSpec(spec.options);
|
var s = generateSpec(spec.options);
|
||||||
tryRunSpec(s).done(done);
|
tryRunSpec(s).done(done);
|
||||||
}, 10 * MINUTE);
|
}, 10 * MINUTE);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('camera.ui.util Delete filler picture from device library', function (done) {
|
it('camera.ui.util Delete filler picture from device library', function (done) {
|
||||||
|
if (isAndroid7 || global.USE_SAUCE) {
|
||||||
|
pending();
|
||||||
|
}
|
||||||
driver
|
driver
|
||||||
.context(webviewContext)
|
.context(webviewContext)
|
||||||
.deleteFillerImage(fillerImagePath)
|
.deleteFillerImage(fillerImagePath)
|
||||||
@ -628,6 +687,9 @@ describe('Camera tests Android.', function () {
|
|||||||
}, MINUTE);
|
}, MINUTE);
|
||||||
|
|
||||||
it('camera.ui.util Delete taken picture from device library', function (done) {
|
it('camera.ui.util Delete taken picture from device library', function (done) {
|
||||||
|
if (isAndroid7 || global.USE_SAUCE) {
|
||||||
|
pending();
|
||||||
|
}
|
||||||
checkSession(done);
|
checkSession(done);
|
||||||
if (!isTestPictureSaved) {
|
if (!isTestPictureSaved) {
|
||||||
// couldn't save test picture earlier, so nothing to delete here
|
// couldn't save test picture earlier, so nothing to delete here
|
||||||
|
@ -114,7 +114,7 @@ module.exports.getPicture = function (opts, pid) {
|
|||||||
// calls a callback with 'ERROR: <error message>' if something is wrong
|
// calls a callback with 'ERROR: <error message>' if something is wrong
|
||||||
// note that this function is executed in the context of tested app
|
// note that this function is executed in the context of tested app
|
||||||
// and not in the context of tests
|
// and not in the context of tests
|
||||||
module.exports.checkPicture = function (pid, options, cb) {
|
module.exports.checkPicture = function (pid, options, skipContentCheck, cb) {
|
||||||
var isIos = cordova.platformId === "ios";
|
var isIos = cordova.platformId === "ios";
|
||||||
var isAndroid = cordova.platformId === "android";
|
var isAndroid = cordova.platformId === "android";
|
||||||
// skip image type check if it's unmodified on Android:
|
// skip image type check if it's unmodified on Android:
|
||||||
@ -179,6 +179,10 @@ module.exports.checkPicture = function (pid, options, cb) {
|
|||||||
errorCallback('Cannot read file. Please install cordova-plugin-file to fix this.');
|
errorCallback('Cannot read file. Please install cordova-plugin-file to fix this.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (skipContentCheck) {
|
||||||
|
cb('OK');
|
||||||
|
return;
|
||||||
|
}
|
||||||
resolveLocalFileSystemURL(result, function (entry) {
|
resolveLocalFileSystemURL(result, function (entry) {
|
||||||
if (skipFileTypeCheck) {
|
if (skipFileTypeCheck) {
|
||||||
displayFile(entry);
|
displayFile(entry);
|
||||||
|
@ -183,7 +183,7 @@ describe('Camera tests iOS.', function () {
|
|||||||
return driver
|
return driver
|
||||||
.context(webviewContext)
|
.context(webviewContext)
|
||||||
.setAsyncScriptTimeout(MINUTE / 2)
|
.setAsyncScriptTimeout(MINUTE / 2)
|
||||||
.executeAsync(cameraHelper.checkPicture, [getCurrentPromiseId(), options])
|
.executeAsync(cameraHelper.checkPicture, [getCurrentPromiseId(), options, false])
|
||||||
.then(function (result) {
|
.then(function (result) {
|
||||||
if (shouldLoad) {
|
if (shouldLoad) {
|
||||||
if (result !== 'OK') {
|
if (result !== 'OK') {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user