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

chore(travis): update iOs test browsers #16493

Merged
merged 2 commits into from
Mar 16, 2018
Merged

chore(travis): update iOs test browsers #16493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36d2ef
chore(travis): update iOs test browsers
Narretz Mar 16, 2018
92984a5
fixup! chore(travis): update iOs test browsers
Narretz Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions karma-shared.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down Expand Up @@ -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'
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion test/ng/directive/ngOptionsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<option>` element's prototype is not
// configurable, so we can't overwrite it with our spy.
if (!/\b(9|\d{2})(?:\.\d+)+ safari/i.test(window.navigator.userAgent)) {
if (!/\b(9|\d{2})(?:\.\d+)+[\s\S]*safari/i.test(window.navigator.userAgent)) {
it('should not re-set the `selected` property if it already has the correct value', function() {
scope.values = [{name: 'A'}, {name: 'B'}];
createMultiSelect();
Expand Down