Merge pull request #284 from FredericHeem/deps20170716

update deps, fix AlertAjax

Author: FredericHeem

client/package.json

@@ -34,47 +34,47 @@
     "url": "https://github.com/FredericHeem/starhackit/issues"
   },
   "dependencies": {
-    "axios": "0.16.1",
+    "axios": "0.16.2",
     "checkit": "0.7.0",
-    "debug": "2.6.6",
+    "debug": "2.6.8",
     "glamor": "2.20.25",
-    "glamorous": "3.19.0",
-    "i18next": "7.1.3",
-    "i18next-browser-languagedetector": "1.0.0",
+    "glamorous": "3.23.5",
+    "i18next": "8.4.3",
+    "i18next-browser-languagedetector": "2.0.0",
     "i18next-localstorage-cache": "1.1.1",
-    "i18next-xhr-backend": "1.4.1",
+    "i18next-xhr-backend": "1.4.2",
     "intl": "1.2.5",
     "lodash": "4.17.4",
     "mdlean": "0.7.0",
-    "mobx": "3.1.9",
-    "mobx-react": "4.1.8",
+    "mobx": "3.2.1",
+    "mobx-react": "4.2.2",
     "preact": "8.2.1",
     "preact-compat": "3.16.0",
     "prop-types": "15.5.10",
-    "qs": "6.4.0",
+    "qs": "6.5.0",
     "react": "15.6.1",
-    "react-color": "2.11.7",
+    "react-color": "2.13.1",
     "react-dom": "15.6.1",
     "react-ga": "2.2.0",
-    "react-helmet": "5.0.3",
-    "react-pagify": "2.2.0",
-    "react-redux": "5.0.4",
+    "react-helmet": "5.1.3",
+    "react-pagify": "2.3.0",
+    "react-redux": "5.0.5",
     "react-router": "3.0.5",
     "react-router-redux": "4.0.8",
     "react-s-alert": "1.3.0",
     "reactabular-table": "8.9.0",
-    "redux": "3.6.0",
+    "redux": "3.7.2",
     "redux-act-async": "1.6.0",
-    "redux-logger": "3.0.1",
+    "redux-logger": "3.0.6",
     "redux-thunk": "2.2.0",
     "segmentize": "0.4.1"
   },
   "devDependencies": {
-    "babel-core": "6.24.1",
+    "babel-core": "6.25.0",
     "babel-eslint": "7.2.3",
-    "babel-loader": "7.0.0",
+    "babel-loader": "7.1.1",
     "babel-plugin-lodash": "3.2.11",
-    "babel-plugin-transform-react-remove-prop-types": "0.4.5",
+    "babel-plugin-transform-react-remove-prop-types": "0.4.6",
     "babel-plugin-transform-runtime": "6.23.0",
     "babel-polyfill": "6.23.0",
     "babel-preset-es2015": "6.24.1",
@@ -83,14 +83,14 @@
     "babel-register": "6.24.1",
     "babel-runtime": "6.23.0",
     "bluebird": "3.5.0",
-    "chai": "3.5.0",
+    "chai": "4.1.0",
     "chalk": "1.1.3",
-    "chance": "1.0.8",
+    "chance": "1.0.10",
     "clean-webpack-plugin": "0.1.16",
-    "compression-webpack-plugin": "0.4.0",
+    "compression-webpack-plugin": "1.0.0",
     "copy-webpack-plugin": "4.0.1",
-    "css-loader": "0.28.1",
-    "enzyme": "2.8.2",
+    "css-loader": "0.28.4",
+    "enzyme": "2.9.1",
     "eslint": "3.19.0",
     "eslint-config-airbnb": "14.1.0",
     "eslint-config-standard-react": "5.0.0",
@@ -103,42 +103,43 @@
     "eslint-plugin-promise": "3.5.0",
     "eslint-plugin-react": "7.0.0",
     "eslint-plugin-standard": "3.0.1",
-    "file-loader": "0.11.1",
-    "html-webpack-plugin": "2.28.0",
+    "file-loader": "0.11.2",
+    "html-webpack-plugin": "2.29.0",
     "http-server": "0.10.0",
     "imports-loader": "0.7.1",
     "istanbul-instrumenter-loader": "0.2.0",
     "jscpd": "0.6.11",
     "json-loader": "0.5.4",
     "karma": "1.7.0",
     "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "2.1.1",
+    "karma-chrome-launcher": "2.2.0",
     "karma-coverage": "1.1.1",
     "karma-mocha": "1.3.0",
     "karma-mocha-reporter": "2.2.3",
     "karma-phantomjs-launcher": "1.0.4",
     "karma-sinon": "1.0.5",
     "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "2.0.3",
-    "lodash-webpack-plugin": "0.11.3",
-    "mocha": "3.3.0",
-    "nightwatch": "0.9.15",
+    "karma-webpack": "2.0.4",
+    "lodash-webpack-plugin": "0.11.4",
+    "mocha": "3.4.2",
+    "nightwatch": "0.9.16",
     "open-browser-webpack-plugin": "0.0.5",
     "phantomjs-prebuilt": "2.1.14",
-    "protractor": "5.1.1",
-    "react-addons-test-utils": "15.5.1",
+    "protractor": "5.1.2",
+    "react-addons-test-utils": "15.6.0",
     "react-hot-loader": "^3.0.0-beta.6",
-    "react-test-renderer": "15.5.4",
-    "sinon": "2.2.0",
-    "style-loader": "0.17.0",
+    "react-test-renderer": "15.6.1",
+    "sinon": "2.3.8",
+    "style-loader": "0.18.2",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.1",
-    "url-loader": "0.5.8",
-    "webpack": "2.5.1",
-    "webpack-bundle-analyzer": "2.8.1",
-    "webpack-bundle-size-analyzer": "2.6.0",
+    "uglify-js": "2.8.29",
+    "url-loader": "0.5.9",
+    "webpack": "3.3.0",
+    "webpack-bundle-analyzer": "2.8.3",
+    "webpack-bundle-size-analyzer": "2.7.0",
     "webpack-dashboard": "0.4.0",
-    "webpack-dev-server": "2.4.5",
+    "webpack-dev-server": "2.5.1",
     "webpack-hud": "0.1.1"
   },
   "engines": {

client/src/app/components/alert/alert.js

@@ -28,9 +28,9 @@ export default ({ tr }) => {
   });
 
   function createAlert(AlertView) {
-    return function Alert({ title, name, message, code }) {
+    return function Alert({ title, name, message, code, className }) {
       return (
-        <AlertView role="alert">
+        <AlertView role="alert" className={className} >
           {title && <h3>{title}</h3>}
           {name &&
             <div>

client/src/app/components/alertAjax/alertAjax.js

@@ -24,7 +24,8 @@ export default (context) => {
     if (!message) {
       message = error.message
     }
-    return (<Alert type="danger" className={className} message={message} />)
+    
+    return (<Alert.Danger className={className} message={message} />)
   }
 
   return AlertAjax;

client/test/nightwatch/nightwatch.json

@@ -21,8 +21,8 @@
     "host" : "127.0.0.1",
     "port" : 4444,
     "cli_args" : {
-      "webdriver.chrome.driver" : "../../node_modules/protractor/node_modules/webdriver-manager/selenium/chromedriver_2.29",
-      "webdriver.gecko.driver" :"../../node_modules/protractor/node_modules/webdriver-manager/selenium/geckodriver-v0.16.1",
+      "webdriver.chrome.driver" : "../../node_modules/protractor/node_modules/webdriver-manager/selenium/chromedriver_2.30",
+      "webdriver.gecko.driver" :"../../node_modules/protractor/node_modules/webdriver-manager/selenium/geckodriver-v0.18.0",
       "webdriver.ie.driver" : ""
     }
   },

client/test/nightwatch/test/testLogin.js

@@ -33,8 +33,8 @@
             .setValue('@emailInput', 'alice')
             .setValue('@passwordInput', 'wrongpassword')
             .click('@submit')
-            .waitForElementVisible('.alert-danger', 5000)
-            .assert.containsText('.alert-danger', 'do not match');
+            .waitForElementVisible('.login-error-view', 5000)
+            .assert.containsText('.login-error-view', 'do not match');
     });
     it('login ok', function (client) {
         client.page.login().navigate()