From 98a0e919902fa96b4cd735991ae3ed301122639f Mon Sep 17 00:00:00 2001
From: Alessandro Arnodo <alessandro@arnodo.net>
Date: Thu, 15 Jan 2015 22:28:37 +0100
Subject: [PATCH] fixing karma configuration fixes # 20

---
 build/karma.config.js |  5 ++--
 package.json          | 68 +++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/build/karma.config.js b/build/karma.config.js
index 2dfa2b1..82a63f5 100755
--- a/build/karma.config.js
+++ b/build/karma.config.js
@@ -9,7 +9,8 @@ module.exports = {
     baseDir + '/src/vendor/angular/angular.js',
     baseDir + '/src/vendor/angular-mocks/angular-mocks.js',
     baseDir + '/src/vendor/angular-ui-router/release/angular-ui-router.js',
-    baseDir + '/src/**/*.js',
+    baseDir + '/src/app/**/*.js',
+    baseDir + '/src/common/**/*.js',
     'build/tmp/*.js',
     baseDir + '/test/unit/**/*.spec.js'
   ],
@@ -47,5 +48,5 @@ module.exports = {
   urlRoot: '/__test/',
 
   //used browsers (overriding in some gulp task)
-  browsers: ['Chrome']
+  browsers: ['PhantomJS']
 };
diff --git a/package.json b/package.json
index 945889d..d958090 100644
--- a/package.json
+++ b/package.json
@@ -13,40 +13,40 @@
     "url": "git@github.com:vesparny/angular-kickstart.git"
   },
   "devDependencies": {
-    "browser-sync": "^1.1.2",
-    "del": "^0.1.3",
-    "gulp": "^3.8.9",
-    "gulp-changed": "^1.0.0",
-    "gulp-concat": "^2.4.1",
-    "gulp-csso": "^0.2.9",
-    "gulp-header": "^1.2.2",
-    "gulp-html2js": "^0.2.0",
-    "gulp-if": "^1.2.5",
-    "gulp-imagemin": "^1.2.1",
-    "gulp-jshint": "^1.8.5",
-    "gulp-load-plugins": "^0.7.0",
-    "gulp-minify-html": "^0.1.6",
-    "gulp-ng-annotate": "^0.3.3",
-    "gulp-ng-html2js": "^0.1.8",
-    "gulp-protractor": "0.0.11",
-    "gulp-rev": "^2.0.1",
-    "gulp-rev-replace": "^0.3.1",
-    "gulp-ruby-sass": "^0.7.1",
-    "gulp-size": "^1.1.0",
-    "gulp-sourcemaps": "^1.2.4",
-    "gulp-uglify": "^1.0.1",
-    "gulp-useref": "^1.0.2",
-    "jshint-stylish": "^1.0.0",
-    "karma": "^0.12.24",
-    "karma-chrome-launcher": "^0.1.5",
-    "karma-coverage": "^0.2.6",
-    "karma-html-reporter": "^0.2.4",
-    "karma-jasmine": "^0.2.3",
-    "karma-mocha-reporter": "^0.3.1",
-    "karma-phantomjs-launcher": "^0.1.4",
-    "lodash": "^2.4.1",
-    "protractor": "~1.4.0",
-    "run-sequence": "^1.0.1"
+    "browser-sync": "~1.1.2",
+    "del": "~0.1.3",
+    "gulp": "~3.8.9",
+    "gulp-changed": "~1.0.0",
+    "gulp-concat": "~2.4.1",
+    "gulp-csso": "~0.2.9",
+    "gulp-header": "~1.2.2",
+    "gulp-html2js": "~0.2.0",
+    "gulp-if": "~1.2.5",
+    "gulp-imagemin": "~2.1.0",
+    "gulp-jshint": "~1.8.5",
+    "gulp-load-plugins": "~0.8.0",
+    "gulp-minify-html": "~0.1.6",
+    "gulp-ng-annotate": "~0.4.4",
+    "gulp-ng-html2js": "~0.1.8",
+    "gulp-protractor": "0.0.12",
+    "gulp-rev": "~2.0.1",
+    "gulp-rev-replace": "~0.3.1",
+    "gulp-ruby-sass": "~0.7.1",
+    "gulp-size": "~1.1.0",
+    "gulp-sourcemaps": "~1.2.4",
+    "gulp-uglify": "~1.0.1",
+    "gulp-useref": "~1.0.2",
+    "jshint-stylish": "~1.0.0",
+    "karma": "~0.12.24",
+    "karma-chrome-launcher": "~0.1.5",
+    "karma-coverage": "~0.2.6",
+    "karma-html-reporter": "~0.2.4",
+    "karma-jasmine": "~0.3.4",
+    "karma-mocha-reporter": "~0.3.1",
+    "karma-phantomjs-launcher": "~0.1.4",
+    "lodash": "~2.4.1",
+    "protractor": "~1.6.1",
+    "run-sequence": "~1.0.1"
   },
   "engines": {
     "node": ">=0.10.x"