Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 0b0a122

Browse files
committed
chore(travis): update iOs test browsers
Closes #16493
1 parent b166f2b commit 0b0a122

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

karma-shared.conf.js

+16-6
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,15 @@ module.exports = function(config, specificOptions) {
104104
platform: 'Windows 10',
105105
version: 'latest-1'
106106
},
107-
'SL_iOS': {
107+
'SL_iOS_10': {
108108
base: 'SauceLabs',
109109
browserName: 'iphone',
110-
platform: 'OS X 10.10',
111-
version: '8.1'
110+
version: '10.3'
111+
},
112+
'SL_iOS_11': {
113+
base: 'SauceLabs',
114+
browserName: 'iphone',
115+
version: '11'
112116
},
113117

114118
'BS_Chrome': {
@@ -156,11 +160,17 @@ module.exports = function(config, specificOptions) {
156160
os: 'Windows',
157161
os_version: '10'
158162
},
159-
'BS_iOS': {
163+
'BS_iOS_10': {
164+
base: 'BrowserStack',
165+
device: 'iPhone 7',
166+
os: 'ios',
167+
os_version: '10.0'
168+
},
169+
'BS_iOS_11': {
160170
base: 'BrowserStack',
161-
device: 'iPhone 6S',
171+
device: 'iPhone 8',
162172
os: 'ios',
163-
os_version: '9.3'
173+
os_version: '11.0'
164174
}
165175
}
166176
});

scripts/travis/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SAUCE_ACCESS_KEY=$(echo "$SAUCE_ACCESS_KEY" | rev)
1414
BROWSERS="SL_Chrome,SL_Chrome-1,\
1515
SL_Firefox,SL_Firefox-1,\
1616
SL_Safari,SL_Safari-1,\
17-
SL_iOS,\
17+
SL_iOS_10,SL_iOS_11,\
1818
SL_IE_9,SL_IE_10,SL_IE_11,\
1919
SL_EDGE,SL_EDGE-1"
2020

test/ng/directive/ngOptionsSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2928,7 +2928,7 @@ describe('ngOptions', function() {
29282928
// getter/setter is not defined on the prototype (probably due to some bug). On Safari 9, the
29292929
// getter/setter that is already defined on the `<option>` element's prototype is not
29302930
// configurable, so we can't overwrite it with our spy.
2931-
if (!/\b(9|\d{2})(?:\.\d+)+ safari/i.test(window.navigator.userAgent)) {
2931+
if (!/\b(9|\d{2})(?:\.\d+)+[\s\S]*safari/i.test(window.navigator.userAgent)) {
29322932
it('should not re-set the `selected` property if it already has the correct value', function() {
29332933
scope.values = [{name: 'A'}, {name: 'B'}];
29342934
createMultiSelect();

0 commit comments

Comments
 (0)