From 8ea6b706ba33a37b8974b95b7892e8e029ca65b0 Mon Sep 17 00:00:00 2001 From: Pavel Reznikov Date: Tue, 9 Aug 2016 19:30:10 -0700 Subject: [PATCH 1/4] update dev dependencies --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index b24b1ef..56e179e 100644 --- a/package.json +++ b/package.json @@ -33,23 +33,23 @@ "connect": "^3.4.1", "coveralls": "^2.11.8", "doctoc": "^1.0.0", - "grunt": "^0.4.5", - "grunt-contrib-connect": "^0.11.2", - "grunt-contrib-copy": "^0.8.2", - "grunt-contrib-cssmin": "^0.14.0", + "grunt": "^1.0.1", + "grunt-contrib-connect": "^1.0.2", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-jshint": "^1.0.0", - "grunt-contrib-uglify": "^0.11.1", - "grunt-contrib-watch": "^0.6.1", + "grunt-contrib-uglify": "^2.0.0", + "grunt-contrib-watch": "^1.0.0", "grunt-doctoc": "^0.1.1", - "grunt-jscs": "^2.8.0", + "grunt-jscs": "^3.0.1", "grunt-protractor-runner": "^3.0.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" From cabb0b886a402a3dccbae10242eefeead96043ce Mon Sep 17 00:00:00 2001 From: Pavel Reznikov Date: Tue, 9 Aug 2016 19:30:37 -0700 Subject: [PATCH 2/4] update travis --- .travis.yml | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index df7ca00..f8cde47 100644 --- a/.travis.yml +++ b/.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= From 8c240d1e8370a617b533d71329ab0e79681080a1 Mon Sep 17 00:00:00 2001 From: Pavel Reznikov Date: Tue, 9 Aug 2016 19:43:50 -0700 Subject: [PATCH 3/4] dev dep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 56e179e..c462592 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "grunt-contrib-watch": "^1.0.0", "grunt-doctoc": "^0.1.1", "grunt-jscs": "^3.0.1", - "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", From 6579b4c93d51ec39def68284ad6cdf547d59820e Mon Sep 17 00:00:00 2001 From: Pavel Reznikov Date: Tue, 9 Aug 2016 19:49:05 -0700 Subject: [PATCH 4/4] dev dep --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c462592..de33b04 100644 --- a/package.json +++ b/package.json @@ -33,15 +33,15 @@ "connect": "^3.4.1", "coveralls": "^2.11.8", "doctoc": "^1.0.0", - "grunt": "^1.0.1", - "grunt-contrib-connect": "^1.0.2", - "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-cssmin": "^1.0.1", + "grunt": "^0.4.5", + "grunt-contrib-connect": "^0.11.2", + "grunt-contrib-copy": "^0.8.2", + "grunt-contrib-cssmin": "^0.14.0", "grunt-contrib-jshint": "^1.0.0", - "grunt-contrib-uglify": "^2.0.0", - "grunt-contrib-watch": "^1.0.0", + "grunt-contrib-uglify": "^0.11.1", + "grunt-contrib-watch": "^0.6.1", "grunt-doctoc": "^0.1.1", - "grunt-jscs": "^3.0.1", + "grunt-jscs": "^2.8.0", "grunt-protractor-runner": "^3.2.0", "grunt-protractor-webdriver": "^0.2.5", "grunt-sass": "^1.1.0",