Skip to content
This repository has been archived by the owner on Jul 30, 2018. It is now read-only.

Move to BrowserStack for CI #52

Merged
merged 2 commits into from
May 22, 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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/intern-local.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export * from './intern';

export const tunnel = 'NullTunnel';
export const tunnel = 'SeleniumTunnel';
export const tunnelOptions = {
hostname: 'localhost',
port: '4444'
Expand Down
10 changes: 6 additions & 4 deletions tests/intern.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down