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

Update CI for new release of grunt-dojo2 #359

Merged
merged 2 commits into from
Oct 27, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install:
- travis_retry npm install
script:
- grunt
- grunt intern:browserstack
- grunt intern:browserstack --test-reporter
- grunt uploadCoverage
- if [ "$TRAVIS_BRANCH" = "master" ]; then grunt doc; fi
notifications:
Expand Down
18 changes: 7 additions & 11 deletions intern.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,11 @@
]
},

"configs": {
"coverage": {
"coverage": [
"./_build/src/**/*.js"
]
},
"coverage": [
"./_build/src/**/*.js"
],

"configs": {
"remoteCapabilities": {
"capabilities": {
"project": "Dojo 2",
Expand All @@ -55,7 +53,7 @@
},

"browserstack": {
"extends": [ "coverage", "remoteCapabilities" ],
"extends": [ "remoteCapabilities" ],

"tunnel": "browserstack",
"capabilities+": {
Expand All @@ -73,8 +71,6 @@
},

"node-loader": {
"extends": [ "coverage" ],

"node": {
"loader": {
"script": "dojo2",
Expand All @@ -94,7 +90,7 @@
},

"local": {
"extends": [ "coverage", "remoteCapabilities" ],
"extends": [ "remoteCapabilities" ],

"tunnel": "selenium",
"tunnelOptions": {
Expand All @@ -108,7 +104,7 @@
},

"saucelabs": {
"extends": [ "coverage", "remoteCapabilities" ],
"extends": [ "remoteCapabilities" ],

"tunnel": "saucelabs",
"tunnelOptions": {},
Expand Down
73 changes: 0 additions & 73 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"grunt": "^1.0.1",
"grunt-dojo2": "latest",
"intern": "~4.0.2",
"istanbul": "0.4.3",
"multer": "~1.3.0",
"sinon": "~1.17.6",
"typescript": "~2.4.1"
Expand Down