adjust retry stuff, fix linting

Webpack files need this, as they error if there's a trailing comma for
function calls!

/* eslint comma-dangle: ["error",
  {"functions": "never", "arrays": "only-multiline", "objects":
"only-multiline"} ] */

Author: justin808

client/webpack.client.base.config.js

@@ -1,5 +1,7 @@
-// Common client-side webpack configuration used by webpack.hot.config and webpack.rails.config.
+/* eslint comma-dangle: ["error",
+  {"functions": "never", "arrays": "only-multiline", "objects": "only-multiline"} ] */
 
+// Common client-side webpack configuration used by webpack.hot.config and webpack.rails.config.
 const webpack = require('webpack');
 const path = require('path');
 const autoprefixer = require('autoprefixer');

client/webpack.client.express.config.js

@@ -1,3 +1,6 @@
+/* eslint comma-dangle: ["error",
+  {"functions": "never", "arrays": "only-multiline", "objects": "only-multiline"} ] */
+
 // Run like this:
 // cd client && node server-express.js
 
@@ -16,7 +19,7 @@ config.entry.app.push(
 
   // Webpack dev server
   `webpack-dev-server/client?http://localhost:${hotPort}`,
-  'webpack/hot/dev-server',
+  'webpack/hot/dev-server'
 );
 
 config.output = {
@@ -27,7 +30,7 @@ config.output = {
 };
 config.plugins.unshift(
   new webpack.HotModuleReplacementPlugin(),
-  new webpack.NoErrorsPlugin(),
+  new webpack.NoErrorsPlugin()
 );
 config.devtool = 'eval-source-map';
 
@@ -71,7 +74,7 @@ config.module.loaders.push(
       'sass',
       'sass-resources',
     ],
-  },
+  }
 );
 
 module.exports = config;

client/webpack.client.rails.build.config.js

@@ -1,3 +1,6 @@
+/* eslint comma-dangle: ["error",
+  {"functions": "never", "arrays": "only-multiline", "objects": "only-multiline"} ] */
+
 // Run like this:
 // cd client && npm run build:client
 // Note that Foreman (Procfile.dev) has also been configured to take care of this.
@@ -21,7 +24,7 @@ config.entry.vendor.unshift(
   'jquery-ujs',
 
   // Configures extractStyles to be true if NODE_ENV is production
-  'bootstrap-loader/extractStyles',
+  'bootstrap-loader/extractStyles'
 );
 
 // See webpack.common.config for adding modules common to both the webpack dev server and rails
@@ -37,7 +40,7 @@ config.module.loaders.push(
     loader: ExtractTextPlugin.extract(
       'style',
       'css?minimize&modules&importLoaders=1&localIdentName=[name]__[local]__[hash:base64:5]' +
-      '!postcss',
+      '!postcss'
     ),
   },
   {
@@ -47,7 +50,7 @@ config.module.loaders.push(
       'css?minimize&modules&importLoaders=3&localIdentName=[name]__[local]__[hash:base64:5]' +
       '!postcss' +
       '!sass' +
-      '!sass-resources',
+      '!sass-resources'
     ),
   },
   {
@@ -57,12 +60,12 @@ config.module.loaders.push(
   {
     test: require.resolve('jquery-ujs'),
     loader: 'imports?jQuery=jquery',
-  },
+  }
 );
 
 config.plugins.push(
   new ExtractTextPlugin('[name]-bundle.css', { allChunks: true }),
-  new webpack.optimize.DedupePlugin(),
+  new webpack.optimize.DedupePlugin()
 );
 
 if (devBuild) {

client/webpack.client.rails.hot.config.js

@@ -1,3 +1,6 @@
+/* eslint comma-dangle: ["error",
+  {"functions": "never", "arrays": "only-multiline", "objects": "only-multiline"} ] */
+
 // Run with Rails server like this:
 // rails s
 // cd client && babel-node server-rails-hot.js
@@ -12,13 +15,13 @@ const hotRailsPort = process.env.HOT_RAILS_PORT || 3500;
 
 config.entry.app.push(
   `webpack-dev-server/client?http://localhost:${hotRailsPort}`,
-  'webpack/hot/only-dev-server',
+  'webpack/hot/only-dev-server'
 );
 
 // These are Rails specific
 config.entry.vendor.push(
   'jquery-ujs',
-  'bootstrap-loader',
+  'bootstrap-loader'
 );
 
 config.output = {
@@ -71,12 +74,12 @@ config.module.loaders.push(
   {
     test: require.resolve('jquery-ujs'),
     loader: 'imports?jQuery=jquery',
-  },
+  }
 );
 
 config.plugins.push(
   new webpack.HotModuleReplacementPlugin(),
-  new webpack.NoErrorsPlugin(),
+  new webpack.NoErrorsPlugin()
 );
 
 config.devtool = 'eval-source-map';

client/webpack.server.rails.build.config.js

@@ -1,3 +1,6 @@
+/* eslint comma-dangle: ["error",
+  {"functions": "never", "arrays": "only-multiline", "objects": "only-multiline"} ] */
+
 // Common webpack configuration for server bundle
 
 const webpack = require('webpack');

spec/spec_helper.rb

@@ -40,7 +40,7 @@
     # Show retry status in spec process
     config.verbose_retry = true
     # Try twice (retry once)
-    config.default_retry_count = 3
+    config.default_retry_count = 6
     # Only retry when Selenium raises Net::ReadTimeout
     # config.exceptions_to_retry = [Net::ReadTimeout]
   end

spec/support/poltergeist.rb

@@ -1,4 +1,4 @@
-CAPYBARA_TIMEOUT_RETRIES = 3
+CAPYBARA_TIMEOUT_RETRIES = 4
 
 # HACK: workaround for Capybara Poltergeist StatusFailErrors, simply retries
 # from https://gist.github.com/afn/c04ccfe71d648763b306
@@ -9,6 +9,12 @@
       example.instance_variable_set("@exception", nil)
       __init_memoized
       ex.run
+
+      puts "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+      puts "poltergeist.rb: #{__LINE__},  method: #{__method__}"
+      puts "example.exception = #{example.exception.ai}"
+      puts "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+
       break unless example.exception.is_a?(Capybara::Poltergeist::StatusFailError)
       puts("\nCapybara::Poltergeist::StatusFailError at #{example.location}\n   Restarting phantomjs and retrying...")
       PhantomJSRestart.call