Merge "Disable Protractor tests and enable strictDi"

app/js/main.js

@@ -38,4 +38,6 @@ angular.module('app').config(onConfig);
 var onRun = require('./on_run');
 angular.module('app').run(onRun);
 
-angular.bootstrap(document, ['app']);
+angular.bootstrap(document, ['app'], {
+  strictDi: true
+});

gulp/tasks/reports.js

@@ -3,7 +3,7 @@
 var config      = require('../config');
 var gulp        = require('gulp');
 
-gulp.task('reports', function() {
+gulp.task('reports', ['prod'], function() {
 
   return gulp.src(config.reports.src)
     .pipe(gulp.dest(config.reports.dest));

package.json

@@ -73,7 +73,7 @@
     "pretest": "npm install",
     "unit": "gulp unit",
     "protractor": "gulp e2e",
-    "test": "gulp unit && gulp e2e",
+    "test": "gulp unit && gulp reports",
     "lint": "eslint ./"
   },
   "dependencies": {},

test/karma.conf.js

@@ -2,6 +2,7 @@
 
 var istanbul = require('browserify-istanbul');
 var isparta  = require('isparta');
+var ngAnnotate = require('browserify-ngannotate');
 
 module.exports = function(config) {
   config.set({
@@ -52,6 +53,7 @@ module.exports = function(config) {
       debug: true,
       transform: [
         'bulkify',
+        ngAnnotate,
         istanbul({
           instrumenter: isparta,
           ignore: ['**/node_modules/**', '**/test/**']