Fixed a couple real bugs in the test and app code

justin808 · justin808 · commit bd3599a0b1d3 · 2016-11-22T21:17:11.000-10:00
Tests passing locally with poltergeist.
diff --git a/.travis.yml b/.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:1ed6d81c-c3e0-4fd0-9012-1d2274c4b261@ondemand.saucelabs.com:80/wd/hub
 install:
   - bundle install
   - nvm install 6.3
diff --git a/Gemfile b/Gemfile
@@ -104,7 +104,7 @@ group :test  do
   gem "generator_spec"
   gem "launchy"
   gem "poltergeist"
-  gem "rspec-rails", "3.5.0.beta3"
+  gem "rspec-rails", "~> 3"
   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
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,12 +38,13 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
     arel (7.1.4)
     ast (2.3.0)
-    autoprefixer-rails (6.5.1.1)
+    autoprefixer-rails (6.5.3)
       execjs
     awesome_print (1.7.0)
     binding_of_caller (0.7.2)
@@ -82,7 +83,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
+    connection_pool (2.2.1)
     coveralls (0.8.15)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -138,7 +139,7 @@ GEM
     nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    parser (2.3.1.4)
+    parser (2.3.2.0)
       ast (~> 2.2)
     pg (0.19.0)
     poltergeist (1.11.0)
@@ -150,7 +151,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.4.0)
+    pry-byebug (3.4.1)
       byebug (~> 9.0)
       pry (~> 0.10)
     pry-doc (0.9.0)
@@ -164,7 +165,8 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    puma (3.6.0)
+    public_suffix (2.0.4)
+    puma (3.6.2)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -201,34 +203,33 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    rdoc (4.3.0)
     react_on_rails (6.1.2)
       addressable
       connection_pool
       execjs (~> 2.5)
       foreman
       rails (>= 3.2)
       rainbow (~> 2.1)
-    rspec-core (3.5.0.beta3)
-      rspec-support (= 3.5.0.beta3)
-    rspec-expectations (3.5.0.beta3)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.5.0.beta3)
-    rspec-mocks (3.5.0.beta3)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.5.0.beta3)
-    rspec-rails (3.5.0.beta3)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (= 3.5.0.beta3)
-      rspec-expectations (= 3.5.0.beta3)
-      rspec-mocks (= 3.5.0.beta3)
-      rspec-support (= 3.5.0.beta3)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
     rspec-retry (0.5.2)
       rspec-core (> 3.3, < 3.6)
-    rspec-support (3.5.0.beta3)
+    rspec-support (3.5.0)
     rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
@@ -248,13 +249,13 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scss_lint (0.50.2)
+    scss_lint (0.50.3)
       rake (>= 0.9, < 12)
       sass (~> 3.4.20)
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    selenium-webdriver (3.0.0)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
@@ -336,14 +337,14 @@ DEPENDENCIES
   rails_12factor
   rainbow
   react_on_rails (~> 6.1)
-  rspec-rails (= 3.5.0.beta3)
+  rspec-rails (~> 3)
   rspec-retry
   rubocop
   ruby-lint
   sass-rails
   scss_lint
   sdoc
-  selenium-webdriver
+  selenium-webdriver (< 3.0.0)
   spring
   spring-commands-rspec
   sqlite3
diff --git a/app/views/pages/_header.html.erb b/app/views/pages/_header.html.erb
@@ -4,6 +4,11 @@
               id: "git-commit-sha" %>
 </p>
 <ul>
+  <li>
+    <%= link_to "Can ShakaCode Help You?",
+                "https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9" %>
+  </li>
+
   <li>
     See the
     <%= link_to "github.com/shakacode/react-webpack-rails-tutorial/README.md",
diff --git a/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx b/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx
@@ -35,13 +35,13 @@ export default class CommentList extends BaseComponent {
 
   render() {
     const { $$comments, cssTransitionGroupClassNames } = this.props;
-    const commentNodes = $$comments.map($$comment =>
+    const commentNodes = $$comments.map(($$comment, index) =>
 
       // `key` is a React-specific concept and is not mandatory for the
       // purpose of this tutorial. if you're curious, see more here:
       // http://facebook.github.io/react/docs/multiple-components.html#dynamic-children
       <Comment
-        key={$$comment.get('id')}
+        key={$$comment.get('id') || index}
         author={$$comment.get('author')}
         text={$$comment.get('text')}
       />
diff --git a/client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx b/client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx
@@ -2,6 +2,7 @@
 // eslint-disable new-cap
 
 import classNames from 'classnames';
+import _ from 'lodash';
 import React, { PropTypes } from 'react';
 
 import CommentsCount from './CommentsCount';
@@ -49,29 +50,17 @@ const NavigationBar = (props) => {
                   'shakacode/react-webpack-rails-tutorial'
                }
               >
-                Source on Github
+                Source
               </a>
             </li>
             <li>
               <a
                 href={
-                  'http://www.railsonmaui.com/' +
-                  'blog/2014/10/03/integrating' +
-                  '-webpack-and-the-es6-transpiler' +
-                  '-into-an-existing-rails-project/'
-               }
-              >Tutorials</a>
-            </li>
-            <li>
-              <a
-                href={
-                  'http://forum.shakacode.com/' +
-                  't/fast-rich-client-rails-development' +
-                  '-with-webpack-and-the-es6-transpiler/82/22'
+                  'https://forum.shakacode.com/c/reactjs'
                }
               >Forum</a>
             </li>
-            {commentsCount && CommentsCount({ commentsCount })}
+            {_.isNumber(commentsCount) && CommentsCount({ commentsCount })}
           </ul>
         </div>
       </div>
diff --git a/client/package.json b/client/package.json
@@ -39,12 +39,12 @@
     "lint": "eslint --ext .js,.jsx ."
   },
   "dependencies": {
-    "autoprefixer": "^6.5.1",
+    "autoprefixer": "^6.5.3",
     "axios": "^0.15.2",
     "babel": "^6.5.2",
     "babel-cli": "^6.18.0",
     "babel-core": "^6.18.2",
-    "babel-loader": "^6.2.7",
+    "babel-loader": "^6.2.8",
     "babel-plugin-transform-es2015-modules-amd": "^6.18.0",
     "babel-polyfill": "^6.16.0",
     "babel-preset-es2015": "^6.18.0",
@@ -54,7 +54,7 @@
     "bootstrap-loader": "^1.3.0",
     "bootstrap-sass": "^3.3.7",
     "classnames": "^2.2.5",
-    "css-loader": "^0.25.0",
+    "css-loader": "^0.26.0",
     "es5-shim": "^4.5.9",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
@@ -64,19 +64,19 @@
     "jquery": "^3.1.1",
     "jquery-ujs": "^1.2.2",
     "loader-utils": "^0.2.16",
-    "lodash": "^4.16.6",
+    "lodash": "^4.17.2",
     "marked": "^0.3.6",
-    "node-sass": "^3.11.0",
+    "node-sass": "^3.13.0",
     "node-uuid": "^1.4.7",
-    "postcss-loader": "^1.1.0",
-    "react": "^15.3.2",
-    "react-addons-pure-render-mixin": "^15.3.2",
-    "react-bootstrap": "^0.30.6",
-    "react-dom": "^15.3.2",
-    "react-on-rails": "^6.1.2",
-    "react-redux": "^4.4.5",
+    "postcss-loader": "^1.1.1",
+    "react": "^15.4.1",
+    "react-addons-pure-render-mixin": "^15.4.1",
+    "react-bootstrap": "^0.30.7",
+    "react-dom": "^15.4.1",
+    "react-on-rails": "^6.2.1",
+    "react-redux": "^4.4.6",
     "react-router": "^3.0.0",
-    "react-router-redux": "^4.0.6",
+    "react-router-redux": "^4.0.7",
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
     "resolve-url-loader": "^1.6.0",
@@ -88,25 +88,25 @@
     "webpack": "^1.13.3"
   },
   "devDependencies": {
-    "babel-eslint": "^7.1.0",
+    "babel-eslint": "^7.1.1",
     "babel-plugin-react-transform": "^2.0.2",
     "body-parser": "^1.15.2",
     "chai": "^3.5.0",
     "chai-immutable": "^1.6.0",
-    "eslint": "^3.9.1",
-    "eslint-config-shakacode": "^13.0.1-beta.1",
+    "eslint": "^3.10.2",
+    "eslint-config-shakacode": "^13.1.0",
     "eslint-import-resolver-webpack": "^0.7.0",
-    "eslint-plugin-import": "^2.0.1",
+    "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.5.0",
+    "eslint-plugin-react": "^6.7.1",
     "estraverse-fb": "^1.3.1",
     "express": "^4.14.0",
     "jsdom": "^9.8.3",
     "mocha": "^3.1.2",
     "pug": "^2.0.0-beta6",
-    "react-addons-test-utils": "^15.3.2",
+    "react-addons-test-utils": "^15.4.1",
     "react-transform-hmr": "^1.0.4",
-    "sleep": "^4.0.0",
+    "sleep": "^5.0.0",
     "webpack-dev-server": "^1.16.2"
   }
 }
diff --git a/spec/features/add_new_comment_spec.rb b/spec/features/add_new_comment_spec.rb
@@ -42,7 +42,7 @@
       include_examples "New Comment Submission", false
       include_examples "Validation errors displaying"
     end
-    context "via the Stacked Form", form: :stacked, driver: js_selenium_driver do
+    context "via the Stacked Form", form: :stacked do
       include_examples "New Comment Submission", false
       include_examples "Validation errors displaying"
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -41,7 +41,7 @@
   # Maybe selenium_firefox webdriver only works for Travis-CI builds.
   # 2016-03-06: Phantomjs, all options fails on MacOs
   # Same for webkit
-  default_driver = :selenium_chrome
+  default_driver = :poltergeist # :selenium_chrome
 
   supported_drivers = %i( poltergeist poltergeist_errors_ok
                           poltergeist_no_animations webkit
@@ -56,7 +56,9 @@
   when :poltergeist, :poltergeist_errors_ok, :poltergeist_no_animations
     require "capybara/poltergeist"
     opts = {
-      extensions: ["#{Rails.root}/spec/support/phantomjs-disable-animations.js"]
+      extensions: ["#{Rails.root}/spec/support/phantomjs-disable-animations.js"],
+      window_size: [1280, 720],
+      screen_size: [1600, 1200]
     }
 
     Capybara.register_driver :poltergeist_no_animations do |app|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -40,9 +40,9 @@
     # Show retry status in spec process
     config.verbose_retry = true
     # Try twice (retry once)
-    config.default_retry_count = 2
+    config.default_retry_count = 3
     # Only retry when Selenium raises Net::ReadTimeout
-    config.exceptions_to_retry = [Net::ReadTimeout]
+    # config.exceptions_to_retry = [Net::ReadTimeout]
   end
 
   # rspec-mocks config goes here. You can use an alternate test double
diff --git a/spec/support/driver_registration.rb b/spec/support/driver_registration.rb
