Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Travis #3609

Closed
wants to merge 1 commit into from
Closed

Travis #3609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 31 additions & 35 deletions test/client/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ const launchers = {
browser: 'firefox',
os: 'Windows',
os_version: '10'
},
bs_safari: {
base: 'BrowserStack',
browser: 'safari',
browser_version: '9.0',
os_version: 'El Capitan',
os: 'OS X'
},
bs_ie_11: {
base: 'BrowserStack',
browser: 'ie',
browser_version: '11.0',
os: 'Windows',
os_version: '10'
},
bs_ie_10: {
base: 'BrowserStack',
browser: 'ie',
browser_version: '10.0',
os: 'Windows',
os_version: '8'
},
bs_ie_9: {
base: 'BrowserStack',
browser: 'ie',
browser_version: '9.0',
os: 'Windows',
os_version: '7'
}
// bs_safari: {
// base: 'BrowserStack',
// browser: 'safari',
// browser_version: '9.0',
// os_version: 'El Capitan',
// os: 'OS X'
// },
// bs_ie_11: {
// base: 'BrowserStack',
// browser: 'ie',
// browser_version: '11.0',
// os: 'Windows',
// os_version: '10'
// },
// bs_ie_10: {
// base: 'BrowserStack',
// browser: 'ie',
// browser_version: '10.0',
// os: 'Windows',
// os_version: '8'
// },
// bs_ie_9: {
// base: 'BrowserStack',
// browser: 'ie',
// browser_version: '9.0',
// os: 'Windows',
// os_version: '7'
// }
}

// Verify the install. This will run async but that's ok we'll see the log.
Expand All @@ -57,26 +57,22 @@ fs.lstat('node_modules/karma', (err, stats) => {
console.log('**** Incorrect directory layout for karma self-tests ****')
console.log(`
$ npm install
$ npm run init
# or if you're on Windows
$ npm run init:windows
$ npm run build
`)
process.exit(1)
})

let browsers = []
let browsers = ['Chrome']

if (process.env.TRAVIS) {
if (TRAVIS_WITH_BS) {
browsers = Object.keys(launchers)
} else {
browsers.push('Firefox')
}
} else {
browsers.push('Chrome')
}

module.exports = function (config) {
Expand Down