Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve SauceLabs iOS setup: iOS 10+ #118

Merged
merged 7 commits into from
Apr 14, 2019
Merged

Improve SauceLabs iOS setup: iOS 10+ #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4e04d7
ios 11.3 and 12.0
janpio Apr 5, 2019
7841f29
see if $XCODE_VERSION works via anchor/alias
janpio Apr 11, 2019
0f08def
no more XCODE_VERSION
janpio Apr 11, 2019
34e74c6
stuff
janpio Apr 11, 2019
f5e4b24
fix: workaround recursive object error (#122)
timbru31 Apr 12, 2019
ebb8e59
Update .travis.yml
janpio Apr 14, 2019
c73d7e6
Merge branch 'master' into janpio-saucelabs_ios_10plus
janpio Apr 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/yd9sTyuwp8CUyKkLWTSoQCqQ9xXbyJmxU3B8obiDRA/321LD8m4jlJy9zJO+pt/wt7zCh081G3bFsyO8VYLkhIQzXYQpppVLHArwImGip82T52c7OUtqknlchLdjoYHVd5zT8k3gqY5mVE6bIS4OFkXAFrQnBUafvAILUfSE7vcrCeNh8UzfGIdq3wFad1zc2NnCx/L/PUgpVM=
env:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions conf/pr/ios-11.3.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"platform": "ios",
"action": "run",
"cleanUpAfterRun": true,
"verbose": true,
"saucePlatformVersion": "11.3",
"sauceAppiumVersion": "1.8.1"
}
8 changes: 8 additions & 0 deletions conf/pr/ios-12.0.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"platform": "ios",
"action": "run",
"cleanUpAfterRun": true,
"verbose": true,
"saucePlatformVersion": "12.0",
"sauceAppiumVersion": "1.9.1"
}
7 changes: 5 additions & 2 deletions lib/appium/helpers/wdHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"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",
"tcp-port-used": "^0.1.2",
"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",
Expand Down