diff --git a/karma-shared.conf.js b/karma-shared.conf.js index e95a95fbc111..ec06ed40a369 100644 --- a/karma-shared.conf.js +++ b/karma-shared.conf.js @@ -104,11 +104,15 @@ module.exports = function(config, specificOptions) { platform: 'Windows 10', version: 'latest-1' }, - 'SL_iOS': { + 'SL_iOS_10': { base: 'SauceLabs', browserName: 'iphone', - platform: 'OS X 10.10', - version: '8.1' + version: '10.3' + }, + 'SL_iOS_11': { + base: 'SauceLabs', + browserName: 'iphone', + version: '11' }, 'BS_Chrome': { @@ -156,23 +160,17 @@ module.exports = function(config, specificOptions) { os: 'Windows', os_version: '10' }, - 'BS_iOS_8': { - base: 'BrowserStack', - device: 'iPhone 6', - os: 'ios', - os_version: '8.3' - }, - 'BS_iOS_9': { - base: 'BrowserStack', - device: 'iPhone 6S', - os: 'ios', - os_version: '9.3' - }, 'BS_iOS_10': { base: 'BrowserStack', device: 'iPhone 7', os: 'ios', os_version: '10.0' + }, + 'BS_iOS_11': { + base: 'BrowserStack', + device: 'iPhone 8', + os: 'ios', + os_version: '11.0' } } }); diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 9338247915a3..39c62de0de65 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -14,7 +14,7 @@ SAUCE_ACCESS_KEY=$(echo "$SAUCE_ACCESS_KEY" | rev) BROWSERS="SL_Chrome,SL_Chrome-1,\ SL_Firefox,SL_Firefox-1,\ SL_Safari,SL_Safari-1,\ -SL_iOS,\ +SL_iOS_10,SL_iOS_11,\ SL_IE_9,SL_IE_10,SL_IE_11,\ SL_EDGE,SL_EDGE-1" diff --git a/test/ng/directive/ngOptionsSpec.js b/test/ng/directive/ngOptionsSpec.js index 2af26f489367..56b11d04f0d2 100644 --- a/test/ng/directive/ngOptionsSpec.js +++ b/test/ng/directive/ngOptionsSpec.js @@ -2928,7 +2928,7 @@ describe('ngOptions', function() { // getter/setter is not defined on the prototype (probably due to some bug). On Safari 9, the // getter/setter that is already defined on the `