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

Commit

Permalink
Update CI for new release of grunt-dojo2 (#101)
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanforbes authored Oct 27, 2017
1 parent f699cd2 commit f5cc847
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 28 deletions.
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 @@ -17,7 +17,7 @@ install:
- travis_retry npm install
script:
- grunt
- grunt intern:saucelabs
- grunt intern:browserstack --test-reporter
- grunt uploadCoverage
- grunt doc
notifications:
Expand Down
34 changes: 9 additions & 25 deletions intern.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"capabilities": {
"project": "Dojo 2",
"name": "@dojo/i18n",
"browserstack.debug": false
},
"environments": [
{ "browserName": "node" }
],
Expand All @@ -18,8 +23,7 @@
{ "name": "cldrjs", "location": "node_modules/cldrjs" },
{ "name": "@dojo", "location": "node_modules/@dojo" },
{ "name": "globalize", "location": "node_modules/globalize", "main": "dist/globalize" },
{ "name": "sinon", "location": "node_modules/sinon/pkg", "main": "sinon" },
{ "name": "grunt-dojo2", "location": "node_modules/grunt-dojo2" }
{ "name": "sinon", "location": "node_modules/sinon/pkg", "main": "sinon" }
],
"map": {
"globalize": {
Expand All @@ -31,48 +35,28 @@
}
}
},
"coverage": [
"./_build/src/**/*.js"
],
"configs": {
"coverage": {
"coverage": [
"./_build/src/**/*.js"
]
},
"remoteCapabilities": {
"project": "Dojo 2",
"name": "@dojo/i18n"
},
"local": {
"extends": [ "coverage" ],
"tunnel": "selenium",
"environments+": [
{ "browserName": "chrome" }
]
},
"browserstack": {
"extends": [ "coverage", "remoteCapabilities" ],

"tunnel": "browserstack",
"capabilities+": {
"browserstack.debug": false
},
"environments+": [
{ "browserName": "internet explorer", "version": "11" },
{ "browserName": "edge" },
{ "browserName": "firefox", "platform": "WINDOWS" },
{ "browserName": "chrome", "platform": "WINDOWS" },
{ "browserName": "safari", "version": "9.1", "platform": "MAC" }
// BrowserStack uses iOS 9.1 and some of the tests fail. I looks like a missing locale problem
// { "browserName": "iPhone" }
]
},
"saucelabs": {
"extends": [ "coverage", "remoteCapabilities" ],

"tunnel": "saucelabs",
"capabilities+": {
"fixSessionCapabilities": false
},

"defaultTimeout": 10000,
"environments+": [
{ "browserName": "internet explorer", "version": [ "10.0", "11.0" ], "platform": "Windows 7" },
Expand Down

0 comments on commit f5cc847

Please sign in to comment.