Update dependencies

.travis.yml

@@ -4,6 +4,10 @@ rvm:
   - 2.3.1
 sudo: false
 addons:
+  sauce_connect:
+    username: "judahmeek"
+  jwt:
+    secure: "A/bVoePCHtwLGH4wVLCHK39+tml2axc/M/Mjnpg4m4bjgMI7GD4YqlnZMNrUBzNAv+Q66pp0sWjTy/Xm4tDaYnSxJFrWjD2wn5ZPpMEyB162nR+QqYqWl5DqP+jlOuIK+7iRmrRTlDS4LLTl43+nWxvRB16aat2U01P/+GKtQ+o="
   apt:
     sources:
       - ubuntu-toolchain-r-test
@@ -15,6 +19,7 @@ env:
   global:
     - RAILS_ENV=test
     - CXX=g++-4.9
+    - SAUCE_LABS_URL=http://judahmeek:[email protected]:80/wd/hub
 install:
   - bundle install
   - nvm install 6.3

Gemfile

@@ -106,5 +106,5 @@ group :test  do
   gem "poltergeist"
   gem "rspec-rails", "3.5.0.beta3"
   gem "rspec-retry"
-  gem "selenium-webdriver", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
+  gem "selenium-webdriver", "<3.0.0", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
 end

Gemfile.lock

@@ -1,67 +1,67 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0)
-      actionpack (= 5.0.0)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0)
-      actionview (= 5.0.0)
-      activesupport (= 5.0.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0)
-      activesupport (= 5.0.0)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0)
-      activesupport (= 5.0.0)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activerecord (5.0.0)
-      activemodel (= 5.0.0)
-      activesupport (= 5.0.0)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
-    arel (7.1.1)
+    arel (7.1.4)
     ast (2.3.0)
-    autoprefixer-rails (6.4.0.1)
+    autoprefixer-rails (6.5.1.1)
       execjs
     awesome_print (1.7.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.3.3)
+    brakeman (3.4.1)
     builder (3.2.2)
     bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    byebug (9.0.5)
+    byebug (9.0.6)
     capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.13)
+    capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
     capybara-webkit (1.11.1)
@@ -133,17 +133,15 @@ GEM
     mini_portile2 (2.1.0)
     mini_racer (0.1.7)
       libv8 (~> 5.3)
-    minitest (5.9.0)
+    minitest (5.9.1)
     multi_json (1.12.1)
     nio4r (1.2.1)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
-    pg (0.18.4)
-    pkg-config (1.1.7)
-    poltergeist (1.10.0)
+    pg (0.19.0)
+    poltergeist (1.11.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -170,17 +168,17 @@ GEM
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0)
-      actioncable (= 5.0.0)
-      actionmailer (= 5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
-      activemodel (= 5.0.0)
-      activerecord (= 5.0.0)
-      activesupport (= 5.0.0)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0)
+      railties (= 5.0.0.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
@@ -192,20 +190,20 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.0.0)
-      actionpack (= 5.0.0)
-      activesupport (= 5.0.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
+    rake (11.3.0)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rdoc (4.2.2)
       json (~> 1.4)
-    react_on_rails (6.1.0)
+    react_on_rails (6.1.2)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -228,20 +226,20 @@ GEM
       rspec-expectations (= 3.5.0.beta3)
       rspec-mocks (= 3.5.0.beta3)
       rspec-support (= 3.5.0.beta3)
-    rspec-retry (0.5.0)
-      rspec-core (~> 3.3)
+    rspec-retry (0.5.2)
+      rspec-core (> 3.3, < 3.6)
     rspec-support (3.5.0.beta3)
-    rubocop (0.42.0)
+    rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-lint (2.3.0)
+    ruby-lint (2.3.1)
       parser (~> 2.2)
       slop (~> 3.4, >= 3.4.7)
     ruby-progressbar (1.8.1)
-    ruby_dep (1.4.0)
+    ruby_dep (1.5.0)
     rubyzip (1.2.0)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -250,10 +248,10 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scss_lint (0.49.0)
+    scss_lint (0.50.2)
       rake (>= 0.9, < 12)
       sass (~> 3.4.20)
-    sdoc (0.4.1)
+    sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
     selenium-webdriver (2.53.4)
@@ -266,29 +264,30 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    spring (1.7.2)
+    spring (2.0.0)
+      activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    term-ansicolor (1.3.2)
+    sqlite3 (1.3.12)
+    term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
     tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.1)
+    uglifier (3.0.3)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.0)
-    web-console (3.3.1)
+    unicode-display_width (1.1.1)
+    web-console (3.4.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       debug_inspector
@@ -344,7 +343,7 @@ DEPENDENCIES
   sass-rails
   scss_lint
   sdoc
-  selenium-webdriver
+  selenium-webdriver (< 3.0.0)
   spring
   spring-commands-rspec
   sqlite3

client/.eslintrc.yml

@@ -16,13 +16,16 @@ env:
   mocha: true
 
 rules:
-  ### Imports
-  # Can't do next one because of alias in webpack
-  import/no-unresolved: 0
   import/extensions: [2, { js: "never", jsx: "never" }]
 
-  # https://github.com/benmosher/eslint-plugin-import/issues/340
-  import/no-extraneous-dependencies: 0
+  # Good idea, but let's go to flow before fixing all these
+  react/forbid-prop-types: 0
 
-  # https://github.com/eslint/eslint/issues/6876 SFC's marked as invalid
-  new-cap: 0
+#  arrow-parens:
+#    - 0
+#    - "as-needed"
+
+settings:
+  import/resolver:
+    webpack:
+      config: 'webpack.client.base.config.js'

client/app/bundles/comments/actions/commentsActionCreators.js

@@ -42,7 +42,7 @@ export function submitCommentFailure(error) {
 }
 
 export function fetchComments() {
-  return dispatch => {
+  return (dispatch) => {
     dispatch(setIsFetching());
     return (
       requestsManager
@@ -54,7 +54,7 @@ export function fetchComments() {
 }
 
 export function submitComment(comment) {
-  return dispatch => {
+  return (dispatch) => {
     dispatch(setIsSaving());
     return (
       requestsManager

client/app/bundles/comments/components/CommentBox/CommentBox.jsx

@@ -2,14 +2,21 @@ import BaseComponent from 'libs/components/BaseComponent';
 import React, { PropTypes } from 'react';
 
 import CommentForm from './CommentForm/CommentForm';
-import CommentList from './CommentList/CommentList';
+import CommentList, { CommentPropTypes } from './CommentList/CommentList';
 import css from './CommentBox.scss';
 
 export default class CommentBox extends BaseComponent {
   static propTypes = {
     pollInterval: PropTypes.number.isRequired,
-    actions: PropTypes.object.isRequired,
-    data: PropTypes.object.isRequired,
+    actions: PropTypes.shape({
+      fetchComments: React.PropTypes.function,
+    }),
+    data: PropTypes.shape({
+      isFetching: React.PropTypes.boolean,
+      isSaving: React.PropTypes.boolean,
+      submitCommentError: React.PropTypes.string,
+      $$comments: React.PropTypes.arrayOf(CommentPropTypes),
+    }).isRequired,
   };
 
   componentDidMount() {