diff --git a/.travis.yml b/.travis.yml index 0123298..c7d13c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ env: global: - SAUCE_USERNAME: dojo2-ts-ci - SAUCE_ACCESS_KEY: e92610e3-834e-4bec-a3b5-6f7b9d874601 - - BROWSERSTACK_USERNAME: dtktestaccount1 - - BROWSERSTACK_ACCESS_KEY: mG2qbEFJCZY2qLsM7yfx + - BROWSERSTACK_USERNAME: dylanschiemann2 + - BROWSERSTACK_ACCESS_KEY: 2upt88qsxsqqeukQvecu before_install: - if [ ${TRAVIS_BRANCH-""} == "master" ] && [ -n ${encrypted_12c8071d2874_key-""} ]; then openssl aes-256-cbc -K $encrypted_12c8071d2874_key -iv $encrypted_12c8071d2874_iv @@ -18,7 +18,7 @@ install: script: - grunt - grunt intern:node --combined -- grunt intern:saucelabs --combined +- grunt intern:browserstack --combined - grunt remapIstanbul:ci - grunt uploadCoverage - grunt dist diff --git a/tests/intern-local.ts b/tests/intern-local.ts index f4892d9..4327144 100644 --- a/tests/intern-local.ts +++ b/tests/intern-local.ts @@ -1,6 +1,6 @@ export * from './intern'; -export const tunnel = 'NullTunnel'; +export const tunnel = 'SeleniumTunnel'; export const tunnelOptions = { hostname: 'localhost', port: '4444' diff --git a/tests/intern.ts b/tests/intern.ts index a362f1f..8084d24 100644 --- a/tests/intern.ts +++ b/tests/intern.ts @@ -19,14 +19,16 @@ export const capabilities = { // OnDemand. Options that will be permutated are browserName, version, platform, and platformVersion; any other // capabilities options specified for an environment will be copied as-is export const environments = [ - { browserName: 'internet explorer', version: [ '10', '11' ], platform: 'WINDOWS' }, + { browserName: 'internet explorer', version: '11' }, + { browserName: 'edge' }, { browserName: 'firefox', platform: 'WINDOWS' }, - { browserName: 'chrome', platform: 'WINDOWS' }/*, - { browserName: 'Safari', version: '9', platform: 'OS X' }*/ + { browserName: 'chrome', platform: 'WINDOWS' }, + { browserName: 'safari', version: '9.1', platform: 'MAC' }, + { browserName: 'iPhone', version: '9.1' } ]; // Maximum number of simultaneous integration tests that should be executed on the remote WebDriver service -export const maxConcurrency = 2; +export const maxConcurrency = 5; // Name of the tunnel class to use for WebDriver tests export const tunnel = 'BrowserStackTunnel';