Skip to content
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
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ install:
- travis_retry npm install
script:
- grunt
- grunt intern:node --combined
- grunt intern:remote --combined
- grunt remapIstanbul:ci
- grunt intern:browserstack
- grunt uploadCoverage
- grunt dist
- grunt doc
Expand Down
7 changes: 5 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ module.exports = function (grunt) {
ts: {
tests: {
compilerOptions: {
module: 'umd',
outDir: '<%= devDirectory %>/tests'
module: 'umd'
},
include: [ 'tests/**/*.ts', 'typings/index.d.ts', 'src/interfaces.d.ts' ]
},
Expand Down Expand Up @@ -59,6 +58,10 @@ module.exports = function (grunt) {
'dist/umd/loader.min.js': 'dist/umd/loader.js'
}
}
},

intern: {
version: 4
}
});

Expand Down
96 changes: 96 additions & 0 deletions intern.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
{
"environments": [
{ "browserName": "node" }
],

"suites": [
"./_build/tests/unit/all.js"
],

"functionalSuites": [
"./_build/tests/functional/all.js"
],

"browser": {
"loader": {
"script": "dojo2",
"options": {
"packages": [
{ "name": "src", "location": "_build/src" },
{ "name": "tests", "location": "_build/tests" },
{ "name": "@dojo", "location": "node_modules/@dojo" },
{ "name": "sinon", "location": "node_modules/sinon/pkg", "main": "sinon" }
]
}
}
},

"node": {
"suites": [
"./_build/tests/unit/all-node.js"
]
},

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

"remoteCapabilities": {
"capabilities": {
"project": "Dojo 2",
"name": "@dojo/shim",
"fixSessionCapabilities": false
}
},

"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" }
],

"maxConcurrency": 5
},

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

"tunnel": "selenium",
"tunnelOptions": {
"hostname": "localhost",
"port": 4444
},

"environments+": [
{ "browserName": "chrome" }
]
},

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

"tunnel": "saucelabs",
"tunnelOptions": {},

"defaultTimeout": 10000,
"environments+": [
{ "browserName": "internet explorer", "version": [ "11.0" ], "platform": "Windows 7" },
{ "browserName": "firefox", "version": "43", "platform": "Windows 10" },
{ "browserName": "chrome", "platform": "Windows 10" }
],
"maxConcurrency": 4
}
}
}
Loading