Skip to content

Commit

Permalink
Build settings.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmdobry committed Oct 31, 2015
1 parent 76d053d commit 0633d01
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ node_modules
coverage/
doc/
bower_components/
junit/

*.iml
.idea/
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ bower.json
Gruntfile.js
*.start.js
karma.conf.js
junit/
test/
lib/
src/
4 changes: 4 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ dependencies:
test:
override:
- npm run ci
general:
artifacts:
- "dist"
- "coverage"
13 changes: 11 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ module.exports = function(config) {
'karma-phantomjs-launcher',
'karma-firefox-launcher',
'karma-coverage',
'karma-browserstack-launcher'
'karma-browserstack-launcher',
'karma-junit-reporter'
],
autoWatch: false,
autoWatchBatchDelay: 4000,
Expand All @@ -47,7 +48,7 @@ module.exports = function(config) {
'test/browser/**/*.test.js'
],

reporters: ['dots', 'coverage'],
reporters: ['dots', 'coverage', 'junit'],

preprocessors: {
'dist/js-data-debug.js': ['coverage']
Expand All @@ -59,6 +60,14 @@ module.exports = function(config) {
dir: 'coverage/'
},

// the default configuration
junitReporter: {
outputDir: process.env.CIRCLE_TEST_REPORTS || 'junit',
outputFile: undefined,
suite: 'js-data',
useBrowserName: false
},

browserStack: {
username: process.env.BROWSERSTACK_USERNAME,
accessKey: process.env.BROWSERSTACK_ACCESS_KEY
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"karma-chrome-launcher": "0.2.1",
"karma-coverage": "0.5.3",
"karma-firefox-launcher": "0.1.6",
"karma-junit-reporter": "0.3.8",
"karma-mocha": "0.2.0",
"karma-phantomjs-launcher": "0.2.1",
"karma-sinon": "1.0.4",
Expand Down

0 comments on commit 0633d01

Please sign in to comment.