From 96f4947aafd1c30ca542373ea787c896d2271a7d Mon Sep 17 00:00:00 2001
From: Julian Lloyd <julianlloyd@gmail.com>
Date: Thu, 13 Jun 2019 18:14:49 -0700
Subject: [PATCH] Upgrade Saucelabs/Appium

---
 .travis.yml        |  5 +++--
 README.md          |  2 +-
 test/karma.conf.js |  6 +++---
 test/sauce.conf.js | 49 ++++++++++++++++++++++------------------------
 4 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d897ec20..4d5e39f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,10 @@ node_js:
   - '9'
 addons:
   chrome: stable
+  hosts: localsauce
 sudo: required
 before_script:
-  - "sudo chown root /opt/google/chrome/chrome-sandbox"
-  - "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
+  - 'sudo chown root /opt/google/chrome/chrome-sandbox'
+  - 'sudo chmod 4755 /opt/google/chrome/chrome-sandbox'
 after_success:
   - npm run coverage
diff --git a/README.md b/README.md
index 1359bf01..cb16f351 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
 
 <p align="center">
 	<a href="https://saucelabs.com/u/scrollreveal">
-		<img src="https://saucelabs.com/browser-matrix/scrollreveal.svg" alt="Browser compatibility matrix" width="100%">
+		<img src="https://saucelabs.com/browser-matrix/scrollreveal.svg?y=1" alt="Browser compatibility matrix" width="100%">
 	</a>
 </p>
 
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 138465b3..7c3b0167 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -69,14 +69,14 @@ module.exports = function(karma) {
 				browsers: Object.keys(customLaunchers),
 				customLaunchers,
 				reporters: ['dots', 'saucelabs'],
+				hostname: 'localsauce',
 				sauceLabs: {
 					testName: 'ScrollReveal',
 					build: process.env.TRAVIS_BUILD_NUMBER || 'manual',
-					tunnelIdentifier:
-						process.env.TRAVIS_BUILD_NUMBER || 'autoGeneratedTunnelID',
+					tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER || 'autoGeneratedTunnelID',
 					recordVideo: true,
 					connectOptions: {
-						'no-ssl-bump-domains': 'all' // because Android 4 has an SSL error?
+						tunnelDomains: 'localsauce' // because Android 8 has an SSL error?
 					}
 				}
 			})
diff --git a/test/sauce.conf.js b/test/sauce.conf.js
index f6a67ef7..37052252 100644
--- a/test/sauce.conf.js
+++ b/test/sauce.conf.js
@@ -1,16 +1,17 @@
-const launchers = {}
+let launchers = {}
 
-const mobileLaunchers = [
-	['iOS', '9.3', 'Safari', 'iPhone 6s Simulator'],
-	['iOS', '10.3', 'Safari', 'iPhone 6s Simulator'],
-	['iOS', '11.1', 'Safari', 'iPhone 6s Simulator'],
-	['Android', '4.4', 'Browser', 'Android Emulator'],
-	['Android', '5.1', 'Browser', 'Android Emulator'],
-	['Android', '6.0', 'Chrome', 'Android Emulator']
+let mobileLaunchers = [
+	['iOS', '10.3', 'Safari', 'iPhone 7 Simulator', '1.9.1'],
+	['iOS', '11.3', 'Safari', 'iPhone 7 Simulator', '1.9.1'],
+	['iOS', '12.2', 'Safari', 'iPhone 7 Simulator', '1.13.0'],
+	['iOS', '13.0', 'Safari', 'iPhone 7 Simulator', '1.15.0'],
+	['Android', '5.1', 'Browser', 'Android Emulator', '1.15.0'],
+	['Android', '6.0', 'Chrome', 'Android Emulator', '1.15.0'],
+	['Android', '8.0', 'Chrome', 'Android Emulator', '1.15.0']
 ]
 
-mobileLaunchers.forEach(([platform, version, browser, device]) => {
-	const launcher = `sl_${platform}_${version}_${browser}`
+for (let [platform, version, browser, device, appium] of mobileLaunchers) {
+	let launcher = `sl_${platform}_${version}_${browser}`
 		.replace(/[^a-z0-9]/gi, '_')
 		.toLowerCase()
 
@@ -21,11 +22,11 @@ mobileLaunchers.forEach(([platform, version, browser, device]) => {
 		browserName: browser,
 		deviceName: device,
 		deviceOrientation: 'portrait',
-		appiumVersion: '1.7.1'
+		appiumVersion: appium
 	}
-})
+}
 
-const desktopLaunchers = [
+let desktopLaunchers = [
 	['Windows 8.1', 'Internet Explorer', '11.0'],
 	['Windows 8', 'Internet Explorer', '10.0'],
 	['macOS 10.12', 'Safari', '11.0'],
@@ -33,8 +34,8 @@ const desktopLaunchers = [
 	['OS X 10.11', 'Safari', '9.0']
 ]
 
-desktopLaunchers.forEach(([platform, browser, version]) => {
-	const launcher = `sl_${platform}_${browser}_${version}`
+for (let [platform, browser, version] of desktopLaunchers) {
+	let launcher = `sl_${platform}_${browser}_${version}`
 		.replace(/[^a-z0-9]/gi, '_')
 		.toLowerCase()
 
@@ -44,21 +45,17 @@ desktopLaunchers.forEach(([platform, browser, version]) => {
 		version,
 		platform
 	}
-})
-
-const evergreenLaunchers = ['Chrome', 'Firefox', 'MicrosoftEdge']
+}
 
-evergreenLaunchers.forEach(browser => {
+for (let browser of ['Chrome', 'Firefox', 'MicrosoftEdge']) {
 	let pastVersions = 3
 	do {
 		pastVersions--
 		let postfix = pastVersions > 0 ? `-${pastVersions}` : ''
-		const version = 'latest' + postfix
+		let version = 'latest' + postfix
 
-		const browserName = browser === 'MicrosoftEdge' ? 'Edge' : browser
-		const launcher = `sl_win10_${browser}_latest${postfix}`
-			.replace(/-/g, '_')
-			.toLowerCase()
+		let browserName = browser === 'MicrosoftEdge' ? 'Edge' : browser
+		let launcher = `sl_win10_${browser}_latest${postfix}`.replace(/-/g, '_').toLowerCase()
 
 		launchers[launcher] = {
 			name: `${browserName} ${version}, Windows 10`,
@@ -67,9 +64,9 @@ evergreenLaunchers.forEach(browser => {
 			platform: 'Windows 10'
 		}
 	} while (pastVersions)
-})
+}
 
-for (const launcher in launchers) {
+for (let launcher in launchers) {
 	launchers[launcher].base = 'SauceLabs'
 }