Skip to content

Commit

Permalink
update karma configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
trepagnier committed Apr 25, 2017
1 parent 45d22b8 commit dfbb7c4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
8 changes: 5 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"name": "time-controls",
"version": "0.0.1",
"main": [
"dist/timecontrols.min.js",
"dist/timecontrols.min.css"
"lib/core/time/controls.js"
],
"description": "time slider and timeline controls for maps",
"homepage": "",
Expand Down Expand Up @@ -32,6 +31,9 @@
},
"devDependencies": {
"bootstrap": "3.0.0",
"angular-mocks": "1.2.21"
"angular-mocks": "1.6.3"
},
"resolutions": {
"angular": "1.6.3"
}
}
20 changes: 10 additions & 10 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,14 @@ gulp.task('minify', ['scripts'], function() {
});

gulp.task('lint', function() {
// var lintStream = gulp.src(sources)
// .pipe(jshint())
// .pipe(jshint.reporter('default'))
// .pipe(jshint.reporter('fail'));
// lintStream.on('error', function() {
// notify('linting failed');
// });
// return lintStream;
var lintStream = gulp.src(sources)
.pipe(jshint())
.pipe(jshint.reporter('default'))
.pipe(jshint.reporter('fail'));
lintStream.on('error', function() {
notify('linting failed');
});
return lintStream;
});

gulp.task('bundleCoreTemplates', function() {
Expand Down Expand Up @@ -322,12 +322,12 @@ gulp.task('tdd', ['test'], function() {
gulp.watch('test/*', ['karma']);
});

gulp.task('test', ['clean', 'karma']);
gulp.task('test', ['scripts', 'karma']);


gulp.task('lazy', ['clean', 'lint', 'lessEdit', 'scripts', 'bundleCore']);

gulp.task('default', ['clean', 'lint', 'test', 'minify', 'docs']);
gulp.task('default', ['test', 'minify']);

gulp.task('develop', ['connect', 'watch']);

Expand Down

0 comments on commit dfbb7c4

Please sign in to comment.