Re-generate js dependencies (#608)

* Re-generate js dependencies

* Retry system specs in CI

* Rubocop fixes

Gemfile

@@ -47,6 +47,7 @@ group :development, :test do
   gem 'pry-rails'
   gem 'rspec'
   gem 'rspec-rails', '~> 5.0.0'
+  gem "rspec-retry"
   gem 'rspec-solr'
   gem 'rubocop-rspec'
   gem 'yard'

Gemfile.lock

@@ -398,6 +398,8 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
+    rspec-retry (0.6.2)
+      rspec-core (> 3.3)
     rspec-solr (3.0.0)
       rspec (~> 3.5)
       rspec-collection_matchers
@@ -588,6 +590,7 @@ DEPENDENCIES
   rsolr (>= 1.0, < 3)
   rspec
   rspec-rails (~> 5.0.0)
+  rspec-retry
   rspec-solr
   rubocop-rspec
   sass-rails (>= 6)

spec/spec_helper.rb

@@ -5,6 +5,10 @@
 require 'coveralls'
 Coveralls.wear!
 
+# Adds the ability to retry flaky tests.
+# See https://github.com/NoRedInk/rspec-retry
+require "rspec/retry"
+
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
@@ -36,6 +40,27 @@
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
+  ### Re-trying flaky system specs
+  # show retry status in spec process
+  config.verbose_retry = true
+  # show exception that triggers a retry if verbose_retry is set to true
+  config.display_try_failure_messages = true
+
+  # Retry failed system specs 3 times, but only in CI
+  if ENV["CI"]
+    config.around :each, type: :system do |ex|
+      ex.run_with_retry retry: 3
+    end
+  end
+
+  # callback to be run between retries
+  config.retry_callback = proc do |ex|
+    # run some additional clean up task - can be filtered by example metadata
+    if ex.metadata[:js]
+      Capybara.reset!
+    end
+  end
+
   # rspec-mocks config goes here. You can use an alternate test double
   # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|