Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.cache
*.swp
build
coverage/
firefox/
gh-pages/
karma.conf.js
Expand Down
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
tests
coverage
examples
tests
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ env:
branches:
only:
- master
- dev

after_success:
- npm run codecov
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
**Building Blocks for the VR Web**

[![build status][travis-image]][travis-url]
[![codecov][codecov-image]][codecov-url]
[![NPM version][npm-image]][npm-url]
[![Downloads][downloads-image]][downloads-url]
[![js-semistandard-style][semistandard-image]][semistandard-url]
Expand Down Expand Up @@ -110,3 +111,6 @@ This program is free software and is distributed under an [MIT License](LICENSE)
[downloads-url]: https://npmjs.org/package/aframe
[semistandard-image]: https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square
[semistandard-url]: https://github.com/Flet/semistandard
<!-- codecov -->
[codecov-image]: https://codecov.io/gh/aframevr/aframe/branch/master/graph/badge.svg
[codecov-url]: https://codecov.io/gh/aframevr/aframe
27 changes: 16 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"browserify": "browserify src/index.js -s 'AFRAME' -p browserify-derequire",
"build": "mkdirp build/ && npm run browserify -- --debug -o build/aframe.js",
"codecov": "codecov",
"dev": "npm run build && node ./scripts/budo",
"dist": "npm run dist:min && npm run dist:max",
"dist:max": "npm run browserify -s -- --debug | exorcist dist/aframe.js.map > dist/aframe.js",
Expand Down Expand Up @@ -40,34 +41,38 @@
"webvr-polyfill": "0.9.15"
},
"devDependencies": {
"browserify": "^11.0.1",
"browserify": "^13.1.0",
"browserify-css": "^0.8.2",
"browserify-derequire": "^0.9.4",
"browserify-istanbul": "^2.0.0",
"budo": "^8.1.0",
"chai": "^3.5.0",
"chai-shallow-deep-equal": "^1.3.0",
"codecov": "^1.0.1",
"exorcist": "^0.4.0",
"gh-pages": "^0.6.0",
"husky": "^0.10.1",
"karma": "^0.13.15",
"karma-browserify": "^4.4.0",
"istanbul": "^0.4.4",
"karma": "^1.2.0",
"karma-browserify": "^5.1.0",
"karma-chai-shallow-deep-equal": "0.0.4",
"karma-chrome-launcher": "^0.2.3",
"karma-chrome-launcher": "^1.0.1",
"karma-coverage": "^1.1.1",
"karma-env-preprocessor": "^0.1.1",
"karma-firefox-launcher": "^0.1.6",
"karma-mocha": "^0.2.0",
"karma-mocha-reporter": "^1.1.0",
"karma-sinon-chai": "^1.1.0",
"lolex": "^1.4.0",
"karma-firefox-launcher": "^1.0.0",
"karma-mocha": "^1.1.1",
"karma-mocha-reporter": "^2.1.0",
"karma-sinon-chai": "^1.2.3",
"lolex": "^1.5.1",
"minifyify": "^7.3.3",
"mkdirp": "0.5.1",
"mocha": "^2.3.3",
"mocha": "^3.0.2",
"mozilla-download": "^1.0.5",
"open": "0.0.5",
"replace": "^0.3.0",
"rimraf": "2.5.0",
"semistandard": "^7.0.2",
"sinon": "^1.17.3",
"sinon": "^1.17.5",
"sinon-chai": "^2.8.0",
"snazzy": "^3.0.0",
"uglifyjs": "^2.4.10"
Expand Down
29 changes: 24 additions & 5 deletions tests/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,18 @@ module.exports = function (config) {
basePath: '../',
browserify: {
debug: true,
paths: ['src']
paths: ['src'],
transform: [
[
'browserify-istanbul', {
instrumenterConfig: {
embedSource: true
},
defaultIgnore: true,
ignore: ['**/node_modules/**', '**/tests/**', '**/vendor/**', '**/*.css']
}
]
]
},
browsers: ['firefox_latest', 'Chrome'],
customLaunchers: {
Expand All @@ -25,11 +36,19 @@ module.exports = function (config) {
// Serve test assets.
{pattern: 'tests/assets/**/*', included: false, served: true}
],
frameworks: ['mocha', 'sinon-chai', 'chai-shallow-deep-equal',
'browserify'],
frameworks: ['mocha', 'sinon-chai', 'chai-shallow-deep-equal', 'browserify'],
preprocessors: {
'tests/**/*.js': ['browserify', 'env']
'tests/**/*.js': ['browserify', 'env'],
'src/**/*.js': ['coverage']
},
reporters: ['mocha']
reporters: ['mocha', 'coverage'],
coverageReporter: {
dir: 'tests/coverage',
includeAllSources: true,
reporters: [
{'type': 'html', subdir: 'report'},
{'type': 'lcov', subdir: '.'}
]
}
});
};