diff --git a/browser-providers.conf.js b/browser-providers.conf.js index d341bcb69d..bdb78bfc62 100644 --- a/browser-providers.conf.js +++ b/browser-providers.conf.js @@ -14,6 +14,7 @@ var CIconfiguration = { 'Chrome': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Firefox': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, + 'FirefoxESR': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, // Disabled because using the "beta" channel of Chrome can cause non-deterministic CI results. // e.g. a new chrome beta version has been released, but the Saucelabs selenium server does // not provide a chromedriver version that is compatible with the new beta. @@ -31,10 +32,10 @@ var CIconfiguration = { 'Android8': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Android9': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Android10': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, - 'Safari12': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, - 'Safari13': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, - 'iOS10': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, - 'iOS11': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, + 'Safari12': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, + 'Safari13': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, + 'iOS12': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, + 'iOS13': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'WindowsPhone': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}} }; @@ -42,23 +43,34 @@ var customLaunchers = { 'DartiumWithWebPlatform': {base: 'Dartium', flags: ['--enable-experimental-web-platform-features']}, 'ChromeNoSandbox': {base: 'Chrome', flags: ['--no-sandbox']}, - 'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '73'}, + 'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '81'}, 'SL_CHROMEBETA': {base: 'SauceLabs', browserName: 'chrome', version: 'beta'}, 'SL_CHROMEDEV': {base: 'SauceLabs', browserName: 'chrome', version: 'dev'}, - 'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '65'}, + 'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '76'}, + // Firefox 68 is the current ESR vesion + 'SL_FIREFOXESR': {base: 'SauceLabs', browserName: 'firefox', version: '68'}, 'SL_FIREFOXBETA': {base: 'SauceLabs', platform: 'Windows 10', browserName: 'firefox', version: 'beta'}, 'SL_FIREFOXDEV': {base: 'SauceLabs', platform: 'Windows 10', browserName: 'firefox', version: 'dev'}, - 'SL_SAFARI7': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.9', version: '7.0'}, - 'SL_SAFARI8': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.10', version: '8.0'}, - 'SL_SAFARI9': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.11', version: '9.0'}, - 'SL_SAFARI10': - {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.12', version: '10.0'}, - 'SL_IOS7': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '7.1'}, - 'SL_IOS8': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '8.4'}, - 'SL_IOS9': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '9.3'}, - 'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.0'}, + 'SL_SAFARI12': + {base: 'SauceLabs', browserName: 'safari', platform: 'macOS 10.13', version: '12.1'}, + 'SL_SAFARI13': + {base: 'SauceLabs', browserName: 'safari', platform: 'macOS 10.15', version: '13.0'}, + 'SL_IOS12': { + base: 'SauceLabs', + browserName: 'Safari', + platform: 'iOS', + version: '12.0', + device: 'iPhone 7 Simulator' + }, + 'SL_IOS13': { + base: 'SauceLabs', + browserName: 'Safari', + platform: 'iOS', + version: '13.0', + device: 'iPhone 11 Simulator' + }, 'SL_IE9': {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'}, 'SL_IE10': { @@ -75,18 +87,6 @@ var customLaunchers = { platform: 'Windows 10', version: '14.14393' }, - 'SL_ANDROID4.1': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.1'}, - 'SL_ANDROID4.2': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.2'}, - 'SL_ANDROID4.3': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.3'}, - 'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'}, - 'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'}, - 'SL_ANDROID6': { - base: 'SauceLabs', - browserName: 'Chrome', - platform: 'Android', - version: '6.0', - device: 'Android Emulator' - }, 'SL_ANDROID7': { base: 'SauceLabs', browserName: 'Chrome', @@ -115,17 +115,9 @@ var customLaunchers = { version: '10.0', device: 'Android GoogleAPI Emulator' }, - 'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'}, 'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'}, - 'BS_SAFARI7': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Mavericks'}, - 'BS_SAFARI8': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Yosemite'}, - 'BS_SAFARI9': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'El Capitan'}, 'BS_SAFARI10': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Sierra'}, - 'BS_IOS7': {base: 'BrowserStack', device: 'iPhone 5S', os: 'ios', os_version: '7.0'}, - 'BS_IOS8': {base: 'BrowserStack', device: 'iPhone 6', os: 'ios', os_version: '8.3'}, - 'BS_IOS9': {base: 'BrowserStack', device: 'iPhone 6S', os: 'ios', os_version: '9.1'}, - 'BS_IOS10': {base: 'BrowserStack', device: 'iPhone SE', os: 'ios', os_version: '10.0'}, 'BS_IE9': {base: 'BrowserStack', browser: 'ie', browser_version: '9.0', os: 'Windows', os_version: '7'}, 'BS_IE10': { @@ -145,16 +137,7 @@ var customLaunchers = { 'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'}, 'BS_WINDOWSPHONE': {base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'}, - 'BS_ANDROID7': {base: 'BrowserStack', device: 'Google Pixel', os: 'android', os_version: '7.1'}, - 'BS_ANDROID6': {base: 'BrowserStack', device: 'Google Nexus 6', os: 'android', os_version: '6.0'}, - 'BS_ANDROID5': {base: 'BrowserStack', device: 'Google Nexus 5', os: 'android', os_version: '5.0'}, - 'BS_ANDROID4.4': {base: 'BrowserStack', device: 'HTC One M8', os: 'android', os_version: '4.4'}, - 'BS_ANDROID4.3': - {base: 'BrowserStack', device: 'Samsung Galaxy S4', os: 'android', os_version: '4.3'}, - 'BS_ANDROID4.2': - {base: 'BrowserStack', device: 'Google Nexus 4', os: 'android', os_version: '4.2'}, - 'BS_ANDROID4.1': - {base: 'BrowserStack', device: 'Google Nexus 7', os: 'android', os_version: '4.1'} + 'BS_ANDROID7': {base: 'BrowserStack', device: 'Google Pixel', os: 'android', os_version: '7.1'} }; var sauceAliases = { @@ -162,20 +145,20 @@ var sauceAliases = { return customLaunchers[item].base == 'SauceLabs'; }), 'DESKTOP': [ - 'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7', - 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10' + 'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI12', 'SL_SAFARI13', 'SL_FIREFOXESR' ], 'MOBILE': [ - 'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', - 'SL_ANDROID6', 'SL_ANDROID7', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10' + 'SL_ANDROID7', 'SL_ANDROID8', 'SL_ANDROID9', 'SL_ANDROID10', 'SL_IOS12', 'SL_IOS13' ], 'ANDROID': [ - 'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', - 'SL_ANDROID6', 'SL_ANDROID7' + 'SL_ANDROID7', 'SL_ANDROID8', 'SL_ANDROID9', 'SL_ANDROID10' + ], + 'FIREFOX': [ + 'SL_FIREFOXESR' ], 'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'], - 'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'], - 'SAFARI': ['SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'], + 'IOS': ['SL_IOS12', 'SL_IOS13'], + 'SAFARI': ['SL_SAFARI12', 'SL_SAFARI13'], 'BETA': ['SL_CHROMEBETA', 'SL_FIREFOXBETA'], 'DEV': ['SL_CHROMEDEV', 'SL_FIREFOXDEV'], 'CI_REQUIRED': buildConfiguration('unitTest', 'SL', true), @@ -187,17 +170,15 @@ var browserstackAliases = { return customLaunchers[item].base == 'BrowserStack'; }), 'DESKTOP': [ - 'BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7', - 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10' + 'BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', ], 'MOBILE': [ - 'BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_ANDROID5', 'BS_ANDROID6', 'BS_ANDROID7', 'BS_IOS7', - 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE' + 'BS_ANDROID7', 'BS_WINDOWSPHONE' ], - 'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_ANDROID5', 'BS_ANDROID6', 'BS_ANDROID7'], + 'ANDROID': ['BS_ANDROID7'], 'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'], - 'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'], - 'SAFARI': ['BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'], + 'IOS': [], + 'SAFARI': [], 'CI_REQUIRED': buildConfiguration('unitTest', 'BS', true), 'CI_OPTIONAL': buildConfiguration('unitTest', 'BS', false) };