Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'master' into firefox-merge-v12
- Loading branch information
Showing
with
5 additions
and
4 deletions.
-
+4
−3
Jenkinsfile
-
+1
−1
package.json
|
|
@@ -147,9 +147,10 @@ node('mac-mini-ios') { |
|
|
screenshots.zip \ |
|
|
test-reports |
|
|
xcrun simctl boot 8A112602-53F8-4996-A58A-FC65665635EB || true |
|
|
xcrun simctl uninstall booted com.cliqz.ios.newCliqz |
|
|
xcrun simctl uninstall booted com.apple.test.WebDriverAgentRunner-Runner |
|
|
xcrun simctl uninstall booted com.apple.test.AppiumTests-Runner |
|
|
xcrun simctl uninstall 8A112602-53F8-4996-A58A-FC65665635EB com.cliqz.ios.newCliqz |
|
|
xcrun simctl uninstall 8A112602-53F8-4996-A58A-FC65665635EB com.apple.test.WebDriverAgentRunner-Runner |
|
|
xcrun simctl uninstall 8A112602-53F8-4996-A58A-FC65665635EB com.apple.test.AppiumTests-Runner |
|
|
sleep 15 |
|
|
xcrun simctl shutdown 8A112602-53F8-4996-A58A-FC65665635EB || true |
|
|
''' |
|
|
} |
|
|
|
|
|
@@ -21,7 +21,7 @@ |
|
|
"readability": "mozilla/readability#3c76104adb00eb9897517e6be6c74c6c05918dfe", |
|
|
"@cliqz/indexeddbshim": "3.4.1", |
|
|
"appium": "1.8.0", |
|
|
"browser-core": "http://cdn2.cliqz.com/update/edge/ghostery-ios/master/1.29.0.1b221.db87186.tgz", |
|
|
"browser-core": "http://cdn2.cliqz.com/update/edge/ghostery-ios/master/1.30.0.1b0.99601b4.tgz", |
|
|
"buffer": "5.0.7", |
|
|
"https-browserify": "1.0.0", |
|
|
"path-browserify": "0.0.0", |
|
|
|