|
|
@@ -5,44 +5,43 @@ var config = require('./protractor-shared-conf').config; |
|
|
|
|
|
config.seleniumAddress = 'http://hub.browserstack.com/wd/hub'; |
|
|
|
|
|
config.multiCapabilities = [{ |
|
|
'browserstack.user': process.env.BROWSER_STACK_USERNAME, |
|
|
'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY, |
|
|
'browserstack.local' : 'true', |
|
|
'browserstack.debug': 'true', |
|
|
'browserstack.tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER, |
|
|
'tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER, |
|
|
|
|
|
'browserName': 'chrome', |
|
|
'platform': 'MAC', |
|
|
'name': 'Angular E2E', |
|
|
'build': process.env.TRAVIS_BUILD_NUMBER, |
|
|
'version': '34' |
|
|
// }, { |
|
|
// 'browserstack.user': process.env.BROWSER_STACK_USERNAME, |
|
|
// 'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY, |
|
|
// 'browserstack.local' : 'true', |
|
|
// 'browserstack.debug': 'true', |
|
|
|
|
|
// 'browserName': 'firefox', |
|
|
// 'name': 'Angular E2E', |
|
|
// 'build': process.env.TRAVIS_BUILD_NUMBER, |
|
|
// 'version': '28' |
|
|
// }, { |
|
|
// 'browserstack.user': process.env.BROWSER_STACK_USERNAME, |
|
|
// 'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY, |
|
|
// 'browserstack.local' : 'true', |
|
|
// 'browserstack.debug': 'true', |
|
|
|
|
|
// 'browserName': 'safari', |
|
|
// 'platform': 'MAC', |
|
|
// 'version': '7', |
|
|
// 'name': 'Angular E2E', |
|
|
// 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, |
|
|
// 'build': process.env.TRAVIS_BUILD_NUMBER |
|
|
}]; |
|
|
config.multiCapabilities = [ |
|
|
capabilitiesForBrowserStack({ |
|
|
browserName: 'chrome', |
|
|
platform: 'MAC', |
|
|
version: '34' |
|
|
}), |
|
|
capabilitiesForBrowserStack({ |
|
|
browserName: 'firefox', |
|
|
version: '28' |
|
|
}), |
|
|
capabilitiesForBrowserStack({ |
|
|
browserName: 'safari', |
|
|
platform: 'MAC', |
|
|
version: '7' |
|
|
}) |
|
|
]; |
|
|
|
|
|
config.allScriptsTimeout = 30000; |
|
|
config.getPageTimeout = 30000; |
|
|
|
|
|
exports.config = config; |
|
|
|
|
|
|
|
|
function capabilitiesForBrowserStack(capabilities) { |
|
|
return { |
|
|
'browserstack.user': process.env.BROWSER_STACK_USERNAME, |
|
|
'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY, |
|
|
'browserstack.local' : 'true', |
|
|
'browserstack.debug': 'true', |
|
|
'browserstack.tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER, |
|
|
'tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER, |
|
|
|
|
|
'name': 'Angular E2E', |
|
|
'build': process.env.TRAVIS_BUILD_NUMBER, |
|
|
|
|
|
'browserName': capabilities.browserName, |
|
|
'platform': capabilities.platform, |
|
|
'version': capabilities.version |
|
|
}; |
|
|
} |