Merge pull request #2118 from 18F/stages/rc-2018-04-26

Deploy RC 56 to int

.circleci/config.yml

@@ -13,7 +13,6 @@ jobs:
           RAILS_ENV: test
           CC_TEST_REPORTER_ID: faecd27e9aed532634b3f4d3e251542d7de9457cfca96a94208a63270ef9b42e
           COVERAGE: true
-          PATH: "/opt/yarn/yarn-v1.5.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -45,23 +44,15 @@ jobs:
 
       - restore-cache:
           keys:
-            - identity-idp-yarn-{{ checksum "yarn.lock" }}
-            - identity-idp-yarn-
+            - v1-identity-idp-yarn-{{ checksum "yarn.lock" }}
+            - v1-identity-idp-yarn-
       - run:
           name: Install Yarn
           command: yarn install --cache-folder ~/.cache/yarn
       - save-cache:
-          key: identity-idp-yarn-{{ checksum "yarn.lock" }}
+          key: v1-identity-idp-yarn-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-
-      - run:
-          name: Install phantomjs
-          command: |
-            sudo curl --output /tmp/phantomjs https://s3.amazonaws.com/circle-downloads/phantomjs-2.1.1
-            sudo chmod ugo+x /tmp/phantomjs
-            sudo ln -sf /tmp/phantomjs /usr/local/bin/phantomjs
-
       - run:
           name: Install AWS CLI
           command: |

.codeclimate.yml

@@ -83,6 +83,7 @@ plugins:
     - 'lib/rspec/formatters/user_flow_formatter.rb'
   rubocop:
     enabled: true
+    channel: rubocop-0-54
   scss-lint:
     enabled: true
 

.reek

@@ -20,6 +20,7 @@ DuplicateMethodCall:
 FeatureEnvy:
   exclude:
     - ActiveJob::Logging::LogSubscriber#json_for
+    - Ahoy::Store#track_event
     - Aws::SES::Base#deliver
     - CustomDeviseFailureApp#build_options
     - CustomDeviseFailureApp#keys

.rubocop.yml

@@ -278,7 +278,18 @@ Style/TrailingCommaInArguments:
     - consistent_comma
     - no_comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  # If `comma`, the cop requires a comma after the last item in an array or
+  # hash, but only when each item is on its own line.
+  # If `consistent_comma`, the cop requires a comma after the last item of all
+  # non-empty array and hash literals.
+  EnforcedStyleForMultiline: comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
+
+Style/TrailingCommaInHashLiteral:
   # If `comma`, the cop requires a comma after the last item in an array or
   # hash, but only when each item is on its own line.
   # If `consistent_comma`, the cop requires a comma after the last item of all
@@ -291,3 +302,12 @@ Style/TrailingCommaInLiteral:
 
 Style/SingleLineBlockParams:
   Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  MinNameLength: 2
+
+Style/ExpandPathArguments:
+  Enabled: false

Dockerfile

@@ -19,18 +19,6 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
   && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
   && apt-get update && apt-get install yarn
 
-# PhantomJS is required for running tests
-# TOOD(sbc): Create a separate production container without this.
-ENV PHANTOMJS_SHA256 86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f
-
-RUN mkdir /usr/local/phantomjs \
-    && curl -o phantomjs.tar.bz2 -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 \
-    && echo "$PHANTOMJS_SHA256 *phantomjs.tar.bz2" | sha256sum -c - \
-    && tar -xjf phantomjs.tar.bz2 -C /usr/local/phantomjs --strip-components=1 \
-    && rm phantomjs.tar.bz2
-
-RUN ln -s ../phantomjs/bin/phantomjs /usr/local/bin/
-
 WORKDIR /upaya
 
 COPY package.json /upaya

Gemfile

@@ -5,7 +5,7 @@ ruby '~> 2.3.7'
 
 gem 'rails', '~> 5.1.3'
 
-gem 'ahoy_matey', '~> 1.6.1'
+gem 'ahoy_matey', '~> 2.0'
 gem 'american_date'
 gem 'aws-sdk-kms', '~> 1.4'
 gem 'aws-sdk-ses', '~> 1.6'
@@ -56,7 +56,7 @@ gem 'two_factor_authentication'
 gem 'typhoeus'
 gem 'uglifier', '~> 3.2'
 gem 'valid_email'
-gem 'webpacker', '~> 3.2.2'
+gem 'webpacker', '~> 3.4'
 gem 'whenever', require: false
 gem 'xml-simple'
 gem 'xmlenc', '~> 0.6.4'
@@ -74,7 +74,7 @@ group :development do
   gem 'rack-mini-profiler', require: false
   gem 'rails-erd'
   gem 'reek'
-  gem 'rubocop', '~> 0.52.0', require: false
+  gem 'rubocop', '~> 0.54.0', require: false
 end
 
 group :development, :test do
@@ -91,13 +91,14 @@ end
 group :test do
   gem 'axe-matchers', '~> 1.3.4'
   gem 'capybara-screenshot', github: 'mattheworiordan/capybara-screenshot'
+  gem 'capybara-selenium'
+  gem 'chromedriver-helper'
   gem 'codeclimate-test-reporter', require: false
   gem 'database_cleaner'
   gem 'email_spec'
   gem 'factory_bot_rails'
   gem 'fakefs', require: 'fakefs/safe'
   gem 'faker'
-  gem 'poltergeist'
   gem 'rack-test'
   gem 'rack_session_access'
   gem 'rails-controller-testing'