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

Commit

Permalink
Convert package and tests to use Intern 4 (#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanforbes authored Oct 17, 2017
1 parent 0b647f4 commit eddcc47
Show file tree
Hide file tree
Showing 20 changed files with 1,385 additions and 1,278 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ install:
- travis_retry npm install
script:
- grunt
- grunt intern:node --combined
- grunt intern:browserstack --combined
- grunt remapIstanbul:ci
- grunt intern:browserstack
- grunt uploadCoverage
notifications:
slack:
Expand Down
4 changes: 3 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module.exports = function (grunt) {
require('grunt-dojo2').initConfig(grunt, {
/* any custom configuration goes here */
intern: {
version: 4
}
});
};
97 changes: 97 additions & 0 deletions intern.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"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" },
{ "name": "maquette", "location": "node_modules/maquette/dist", "main": "maquette" },
{ "name": "pepjs", "location": "node_modules/pepjs/dist", "main": "pep" }
]
}
}
},

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

"remoteCapabilities": {
"capabilities": {
"project": "Dojo 2",
"name": "@dojo/test-extras",
"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" },
{ "browserName": "safari", "version": "9.1", "platform": "MAC" },
{ "browserName": "iPhone", "version": "9.1" }
],

"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": "microsoftedge", "platform": "Windows 10" },
{ "browserName": "firefox", "version": "43", "platform": "Windows 10" },
{ "browserName": "chrome", "platform": "Windows 10" },
{ "browserName": "safari", "version": "10", "platform": "OS X 10.12" },
{ "browserName": "iphone", "version": "9.3" }
],
"maxConcurrency": 4
}
}
}
Loading

0 comments on commit eddcc47

Please sign in to comment.