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

chore(browserstack): Update OS X, make iOS 8-10 available to test #15910

Merged
merged 1 commit into from
Apr 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 16 additions & 4 deletions karma-shared.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ module.exports = function(config, specificOptions) {
base: 'BrowserStack',
browser: 'chrome',
os: 'OS X',
os_version: 'Yosemite'
os_version: 'Sierra'
},
'BS_Safari': {
base: 'BrowserStack',
browser: 'safari',
os: 'OS X',
os_version: 'Yosemite'
os_version: 'Sierra'
},
'BS_Firefox': {
base: 'BrowserStack',
browser: 'firefox',
os: 'Windows',
os_version: '8'
os_version: '10'
},
'BS_IE_9': {
base: 'BrowserStack',
Expand All @@ -120,11 +120,23 @@ module.exports = function(config, specificOptions) {
os: 'Windows',
os_version: '8.1'
},
'BS_iOS': {
'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'
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ "$JOB" == "ci-checks" ]; then
grunt ci-checks
elif [ "$JOB" == "unit" ]; then
if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS"
BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS_8,BS_iOS_9"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not BS_iOS_10 too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS 10 fails one test.

else
BROWSERS="SL_Chrome,SL_Firefox,SL_Safari_8,SL_Safari_9,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
fi
Expand Down