You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2019/04/14 15:20:58 UTC
[cordova-paramedic] branch master updated: Improve SauceLabs iOS
setup: iOS 10+ (#118)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-paramedic.git
The following commit(s) were added to refs/heads/master by this push:
new a37baad Improve SauceLabs iOS setup: iOS 10+ (#118)
a37baad is described below
commit a37baad051227944ffd5d19a38e68a6489de20f0
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sun Apr 14 17:20:54 2019 +0200
Improve SauceLabs iOS setup: iOS 10+ (#118)
* ios 11.3 and 12.0
* see if $XCODE_VERSION works via anchor/alias
* no more XCODE_VERSION
* stuff
* fix: workaround recursive object error (#122)
<!--
Please make sure the checklist boxes are all checked before submitting the PR. The checklist is intended as a quick reference, for complete details please see our Contributor Guidelines:
http://cordova.apache.org/contribute/contribute_guidelines.html
Thanks!
-->
### Platforms affected
### Motivation and Context
<!-- Why is this change required? What problem does it solve? -->
<!-- If it fixes an open issue, please link to the issue here. -->
### Description
<!-- Describe your changes in detail -->
### Testing
<!-- Please describe in detail how you tested your changes. -->
### Checklist
- [ ] I've run the tests to see all new and existing tests pass
- [ ] I added automated test coverage as appropriate for this change
- [ ] Commit is prefixed with `(platform)` if this change only applies to one platform (e.g. `(android)`)
- [ ] If this Pull Request resolves an issue, I linked to the issue in the text above (and used the correct [keyword to close issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))
- [ ] I've updated the documentation if necessary
* Update .travis.yml
Co-authored-by: Tim Brust <ra...@gmx.de>
---
.travis.yml | 20 +++++++++++++++-----
conf/pr/ios-11.3.config.json | 8 ++++++++
conf/pr/ios-12.0.config.json | 8 ++++++++
lib/appium/helpers/wdHelper.js | 7 +++++--
package-lock.json | 14 +++++++-------
package.json | 4 ++--
6 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6f27e31..8741539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
sudo: false
addons:
+ # sauce labs key
jwt:
secure: NJr2X/VRsRjy/6cQqrx1kVwNH8UmVq4Ns90UjHMYFeSjacczc42qOCgMfCOxN8FBa5T6H7vqGnloTdpp56Vm1BPSLqX/M3uT1gM9/yGDsgKzEC90tt2WrGSyp7C2LRs5+EF+bj5hvFd+iO4bLA7nTnOTzgxwwzzsau0ljxx1VHbVHi2xOwuK7/ShwOhxfkNEHeJ76X/1sjssKgU++tU3uUAdiBqUupqpQmWVPsxKTp4svOcNNlBKqk+SMX8EDmeU36AXC3QBMVWmpug0z55gmmGsu8bAWRo6iKc9U0B43g5Tgw3DaRs/cNNJWN3mX/04hVJFJEzHvGaTbEvOXngHyDAtuDl9FiHYZpJK3H5eRhcXAh6IQXloYnXTzEQCIaX3N9p8gpFmMgOhMPy5a0iSIv2wcU1bNtzfbD5JokJp0vLsFphSrvhlOfKwOg0pq/dU66P1MTwHj6bwmxPK+GtQu8hRY/pA/yd9 [...]
env:
@@ -11,9 +12,15 @@ env:
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
language: node_js
-node_js: 6
+node_js:
+ - "6"
+
+# yaml anchor/alias: https://medium.com/@tommyvn/travis-yml-dry-with-anchors-8b6a3ac1b027
+
+_ios: &_ios
+ os: osx
+ osx_image: xcode10.2
-# anchor/alias: https://medium.com/@tommyvn/travis-yml-dry-with-anchors-8b6a3ac1b027
_android: &_android
language: android
os: linux
@@ -43,9 +50,12 @@ matrix:
- env: PLATFORM=browser-edge
- env: PLATFORM=ios-10.0
- os: osx
- osx_image: xcode9
-
+ <<: *_ios
+ - env: PLATFORM=ios-11.3
+ <<: *_ios
+ - env: PLATFORM=ios-12.0
+ <<: *_ios
+
- env: PLATFORM=android-4.4
<<: *_android
- env: PLATFORM=android-5.1
diff --git a/conf/pr/ios-11.3.config.json b/conf/pr/ios-11.3.config.json
new file mode 100644
index 0000000..c47d1ea
--- /dev/null
+++ b/conf/pr/ios-11.3.config.json
@@ -0,0 +1,8 @@
+{
+ "platform": "ios",
+ "action": "run",
+ "cleanUpAfterRun": true,
+ "verbose": true,
+ "saucePlatformVersion": "11.3",
+ "sauceAppiumVersion": "1.8.1"
+}
diff --git a/conf/pr/ios-12.0.config.json b/conf/pr/ios-12.0.config.json
new file mode 100644
index 0000000..72e0154
--- /dev/null
+++ b/conf/pr/ios-12.0.config.json
@@ -0,0 +1,8 @@
+{
+ "platform": "ios",
+ "action": "run",
+ "cleanUpAfterRun": true,
+ "verbose": true,
+ "saucePlatformVersion": "12.0",
+ "sauceAppiumVersion": "1.9.1"
+}
diff --git a/lib/appium/helpers/wdHelper.js b/lib/appium/helpers/wdHelper.js
index d6f97de..f217894 100644
--- a/lib/appium/helpers/wdHelper.js
+++ b/lib/appium/helpers/wdHelper.js
@@ -234,10 +234,13 @@ module.exports.pollForEvents = function (driver, platform, skipBuster, windowOff
// get the results and clean up the cache
var result = window._jasmineParamedicProxyCache;
window._jasmineParamedicProxyCache = [];
- return result;
+ return JSON.stringify(result);
}, [])
.then(function (result) {
- // found
+ if (result) {
+ result = JSON.parse(result);
+ }
+ // found
if (Object.prototype.toString.call(result) === '[object Array]') {
return result;
}
diff --git a/package-lock.json b/package-lock.json
index be17944..e8018ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2114,11 +2114,11 @@
}
},
"rimraf": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
- "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"requires": {
- "glob": "^7.0.5"
+ "glob": "^7.1.3"
},
"dependencies": {
"glob": {
@@ -2165,9 +2165,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"sauce-connect-launcher": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz",
- "integrity": "sha512-X2vfwulR6brUGiicXKxPm1GJ7dBEeP1II450Uv4bHGrcGOapZNgzJvn9aioea5IC5BPp/7qjKdE3xbbTBIVXMA==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.5.tgz",
+ "integrity": "sha512-q9GoMBgsBApfYC/GWfNZMgoYOls6YZ77bJ7kXiHDtltVnV+QFiz0/Ac7LSRd6n69RfP/ful8spIFWv0oFs3eOQ==",
"requires": {
"adm-zip": "~0.4.3",
"async": "^2.1.2",
diff --git a/package.json b/package.json
index fa6f215..1c2b92d 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
"path-extra": "^3.0.0",
"q": "^1.4.1",
"randomstring": "^1.1.5",
- "sauce-connect-launcher": "^1.2.2",
+ "sauce-connect-launcher": "^1.2.5",
"saucelabs": "^1.2.0",
"shelljs": "~0.3.0",
"socket.io": "^1.4.5",
@@ -58,7 +58,7 @@
"tmp": "0.0.25",
"tree-kill": "^1.1.0",
"unorm": "^1.4.1",
- "wd": "^1.2.0"
+ "wd": "^1.11.1"
},
"devDependencies": {
"eslint": "^5.16.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org