Merge 9d1c218 into 32cdf6d

.travis.yml

@@ -15,7 +15,8 @@ install:
 - npm install
 before_script:
 - grunt install
-- phantomjs --version
+script:
+- sh ./tests/travis.sh
 after_script:
 - cat ./tests/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
 env:

package.json

@@ -37,30 +37,29 @@
     "angular": "^1.3.0",
     "angular-mocks": "^1.6.0",
     "coveralls": "^2.11.2",
-    "grunt": "~0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-connect": "^0.9.0",
+    "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-uglify": "^0.7.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-karma": "^0.10.1",
+    "grunt-contrib-uglify": "^2.0.0",
+    "grunt-contrib-watch": "^1.0.0",
+    "grunt-karma": "^2.0.0",
     "grunt-notify": "^0.4.1",
-    "grunt-protractor-runner": "^1.2.1",
+    "grunt-protractor-runner": "^4.0.0",
     "grunt-shell-spawn": "^0.3.1",
     "jasmine-core": "^2.2.0",
     "jasmine-spec-reporter": "^2.1.0",
-    "karma": "~0.12.31",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-coverage": "^0.2.7",
+    "karma": "^1.3.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "^1.1.1",
     "karma-failed-reporter": "0.0.3",
-    "karma-firefox-launcher": "^0.1.4",
-    "karma-html2js-preprocessor": "~0.1.0",
-    "karma-jasmine": "^0.3.5",
-    "karma-phantomjs-launcher": "~0.1.4",
-    "karma-sauce-launcher": "~0.2.10",
-    "karma-spec-reporter": "0.0.16",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-html2js-preprocessor": "^1.1.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-sauce-launcher": "^1.1.0",
+    "karma-spec-reporter": "^0.0.26",
     "load-grunt-tasks": "^3.1.0",
-    "protractor": "^1.6.1"
+    "protractor": "^4.0.13"
   }
 }