Merge pull request #493 from troolee/troolee

Troolee

Author: troolee

.travis.yml

@@ -1,35 +1,31 @@
 language: node_js
-
 node_js:
-    - "5.7.0"
-
+- 5.7.0
 env:
-    - CXX=g++-4.8
-
+- CXX=g++-4.8
 addons:
-    apt:
-        sources:
-            - ubuntu-toolchain-r-test
-        packages:
-            - g++-4.8
-
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
 before_install:
-    - npm install -g protractor
-
+- npm install -g protractor
 install:
-    - npm install -g npm@2
-    - npm install -g grunt-cli
-    - npm install -g bower
-    - bower install
-    - npm install
-    - ./node_modules/protractor/bin/webdriver-manager update --standalone
-
+- npm install -g npm@2
+- npm install -g grunt-cli
+- npm install -g bower
+- bower install
+- npm install
+- ./node_modules/protractor/bin/webdriver-manager update --standalone
 before_script:
-    - export CHROME_BIN=chromium-browser
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 script:
-    - npm run build
-    - npm test
-    - grunt e2e-test
+- npm run build
+- npm test
+- grunt e2e-test
+notifications:
+  slack:
+    secure: iGLGsYyVIyKVpVVCskGh/zc6Pkqe0D7jpUtbywSbnq6l5seE6bvBVqm0F2FSCIN+AIC+qal2mPEWysDVsLACm5tTEeA8NfL8dmCrAKbiFbi+gHl4mnHHCHl7ii/7UkoIIXNc5UXbgMSXRS5l8UcsSDlN8VxC5zWstbJvjeYIvbA=

package.json

@@ -42,14 +42,14 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt-doctoc": "^0.1.1",
     "grunt-jscs": "^2.8.0",
-    "grunt-protractor-runner": "^3.0.0",
+    "grunt-protractor-runner": "^3.2.0",
     "grunt-protractor-webdriver": "^0.2.5",
     "grunt-sass": "^1.1.0",
     "jasmine-core": "^2.4.1",
-    "karma": "^0.13.22",
-    "karma-coverage": "^0.5.5",
+    "karma": "^1.1.2",
+    "karma-coverage": "^1.1.1",
     "karma-coveralls": "^1.1.2",
-    "karma-jasmine": "^0.3.7",
+    "karma-jasmine": "^1.0.2",
     "karma-phantomjs-launcher": "^1.0.0",
     "phantomjs-prebuilt": "^2.1.5",
     "serve-static": "^1.10.2"