Skip to content

Commit

Permalink
Merge a8a1afc into 3fca456
Browse files Browse the repository at this point in the history
  • Loading branch information
johnjbarton authored Jan 12, 2021
2 parents 3fca456 + a8a1afc commit e36bccf
Showing 1 changed file with 31 additions and 35 deletions.
66 changes: 31 additions & 35 deletions test/client/karma.conf.js
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

0 comments on commit e36bccf

Please sign in to comment.