Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:lwhiteley/AngularLogExtender
Browse files Browse the repository at this point in the history
* 'develop' of github.com:lwhiteley/AngularLogExtender:
  updated config for lcov
  • Loading branch information
ferronrsmith committed Jan 8, 2014
2 parents 64688ea + 00c6df8 commit 1a714bb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion config/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// an example karma.conf.js
module.exports = function (config) {
config.set({
basePath: '../',
Expand Down
2 changes: 1 addition & 1 deletion config/karma.lcov.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ module.exports = function (config) {
'libs/angular/angular-mocks.js',
'libs/angular/datespy.js',
'test/helpers/globals.js',
'src/declarations.js',
'src/enhanceObj/*.js',
'src/eLogger/logger.js',
'src/eLogger/globals.js',
'src/extras/*.js',
'src/providerFunc/*.js',
'src/declarations.js',
'test/unit/*.js'
],
exclude : ['src/enhanceObj/globals.js'],
Expand Down

0 comments on commit 1a714bb

Please sign in to comment.