Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for 3.0.0 #37

Merged
merged 1 commit into from
Jul 23, 2018
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
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
/_build
/bower_components
/coverage
/dist
/html-report
/node_modules
/typings
.baseDir.ts
.tscache
coverage/
coverage-unmapped.json
coverage-final.json
coverage-final.lcov
npm-debug.log
yarn.lock
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ env:
- BROWSERSTACK_ACCESS_KEY: 4Q2g8YAc9qeZzB2hECnS
- SAUCE_USERNAME: dojo2-ts-ci
- SAUCE_ACCESS_KEY: e92610e3-834e-4bec-a3b5-6f7b9d874601
- FORCE_COLOR: 1
install:
- travis_retry npm install grunt-cli
- travis_retry npm install
script:
- grunt
- grunt intern:node --test-reporter
- grunt dist
- grunt uploadCoverage
- npm test
- npm run uploadCoverage
notifications:
slack:
secure: SUW1XF8Nggc5m+Xw3U7qaMFM9Tfn0NmvZePI84K9INDlLx+YxVZouteKN0XW9WsgJbI0ZiJE0CthJRS/twcjW4hO/LaizXYbqQaC+3pEUGajgYL1rbpqr0BfKmPKplvR/LbbTMo/GfUOOmU5F5ajWh1HWadHp1Dj/GSPzms97FLq0Xs0bWe/saX17v69V+36X7jyIrWPdQ3nVH284bbLMKnlNQ7t0LuPD748m1neLGNdQTC2R7P2eFoRS5hR61qY4m2my96wH2PndVbt1HuTW2S61wAX3DCQ+5a21bTnv+VCawvhlEZq3/zgr9w0M7WAeFqbdA7gwvaAV3N80JAdvwX60Wfw4rfwADTwj/KAAgF3dbc4iYTwUunCjZKydgUn1WWIG2sLBb0u2GfXAWINOWeDm2tZPPFx9nB/8Fjxnasp85F9TXxhyMXkybKaV0hf57rjaGTDXkl3PxzFTOnpakZU/+Gv68UhO+VwDjuQakBuCg43xV9jrVHWZ941LP13bBhNh2u3UKJafrBQLf6SchbQyx8/iWwLgHNuHpskKjoHIo/bOTqFaHHo6o4UHnT5KeLdXLvyxM5pg7UyYHrT1T4kUzbVQtWGCba5EI+H3A11RLwKjKir4utdMsZgkJ8+ORNW499OOlk8Hfs2tGs/EbH9yxGTWzLEJWiu5LWJt5Y=
82 changes: 3 additions & 79 deletions intern.json
Original file line number Diff line number Diff line change
@@ -1,82 +1,6 @@
{
"capabilities": {
"project": "Dojo 2",
"name": "@dojo/cli-create-theme",
"fixSessionCapabilities": false,
"browserstack.debug": false
},

"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": "@dojo", "location": "node_modules/@dojo" }
]
}
}
},

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

"configs": {
"browserstack": {
"tunnel": "browserstack",

"environments+": [
{ "browserName": "internet explorer", "version": "11" },
{ "browserName": "edge" },
{ "browserName": "firefox", "platform": "WINDOWS" },
{ "browserName": "chrome", "platform": "WINDOWS" },
{ "browserName": "safari", "platform": "MAC" }
],

"maxConcurrency": 5
},

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

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

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

"defaultTimeout": 10000,
"environments+": [
{ "browserName": "internet explorer", "version": [ "10.0", "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": "9", "platform": "OS X 10.11" },
{ "browserName": "iphone", "version": "9.3" }
],
"maxConcurrency": 4
}
"extends": "./node_modules/@dojo/scripts/intern/base.json",
"capabilities+": {
"name": "@dojo/cli-create-theme"
}
}
Loading