Merge pull request #267 from MapStory/resolve-mapstory#652

Improve Karma Configuration

bower.json

@@ -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": "",
@@ -32,6 +31,9 @@
   },
   "devDependencies": {
     "bootstrap": "3.0.0",
-    "angular-mocks": "1.2.21"
+    "angular-mocks": "1.6.3"
+  },
+  "resolutions": {
+    "angular": "1.6.3"
   }
 }

gulpfile.js

@@ -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() {
@@ -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']);