Merge pull request #4130 from 18F/stages/rc-2020-08-26

Deploy RC 117 to Production

.circleci/config.yml

@@ -12,7 +12,7 @@ executors:
   ruby_browsers:
     docker:
       # Specify the Ruby version you desire here
-      - image: circleci/ruby:2.6.5-node-browsers
+      - image: circleci/ruby:2.6.6-node-browsers
         environment:
           RAILS_ENV: test
 
@@ -23,7 +23,7 @@ executors:
         environment:
           POSTGRES_USER: circleci
 
-      - image: redis:4.0.1
+      - image: redis:5.0.8
 
 commands:
   bundle-yarn-install:
@@ -181,7 +181,9 @@ jobs:
           command: |
             yarn run lint
             yarn run typecheck
+            bundle exec rubocop
             bundle exec slim-lint app/views
+            make check_asset_strings
   build-latest-container:
     working_directory: ~/identity-idp
     docker:

.codeclimate.yml

@@ -9,8 +9,7 @@ checks:
   file-lines:
     enabled: false
   method-complexity:
-    config:
-      threshold: 15
+    enabled: false
   method-count:
     enabled: false
   method-lines:
@@ -72,9 +71,6 @@ plugins:
     enabled: true
   reek:
     enabled: false
-  rubocop:
-    enabled: true
-    channel: rubocop-0-72
   scss-lint:
     enabled: true
     checks:

.eslintrc

@@ -1,41 +1,41 @@
 {
   "extends": "airbnb",
-  "parser": "babel-eslint",
-  "plugins": ["prettier"],
+  "parser": "@babel/eslint-parser",
+  "plugins": ["prettier", "@babel"],
   "env": {
     "browser": true,
     "commonjs": true,
     "es6": true,
-    "mocha": true
+    "mocha": true,
+    "jquery": true
   },
   "globals": {
-    "$": true,
-    "__DEV__": true,
-    "assert": true,
-    "chai": true,
-    "sinon": true,
-    "expect": true,
-    "fixture": true
+    "expect": true
   },
   "rules": {
+    "@babel/no-unused-expressions": "error",
+    "consistent-return": "off",
+    "curly": ["error", "all"],
     "prettier/prettier": "error",
     "func-names": 0,
     "function-paren-newline": "off",
     "prefer-arrow-callback": 0,
     "import/prefer-default-export": "off",
     "import/extensions": ["off", "never"],
+    "indent": "off",
     "newline-per-chained-call": "off",
     "no-param-reassign": ["off", "never"],
     "no-confusing-arrow": "off",
+    "no-plusplus": "off",
+    "no-unused-expressions": "off",
     "implicit-arrow-linebreak": "off",
     "object-curly-newline": "off",
     "operator-linebreak": "off",
+    "react/jsx-curly-newline": "off",
+    "react/jsx-indent": "off",
     "react/jsx-one-expression-per-line": "off",
-    "react/prop-types": "off"
-  },
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module"
+    "react/prop-types": "off",
+    "require-await": "error"
   },
   "settings": {
     "import/core-modules": [
@@ -49,6 +49,15 @@
       "app/utils/ms-formatter",
       "app/phone-internationalization",
       "app/i18n-dropdown"
-    ]
-  }
+    ],
+    "import/internal-regex": "^@18f/identity-"
+  },
+  "overrides": [
+    {
+      "files": "spec/javascripts/**/*",
+      "rules": {
+        "react/jsx-props-no-spreading": "off"
+      }
+    }
+  ]
 }

.gitignore

@@ -74,7 +74,7 @@ saml_*.key
 /kitchen/data_bags/config/databag_secrets.json
 /public/packs
 /public/packs-test
-/node_modules
+**/node_modules
 yarn-debug.log*
 yarn-error.log*
 .yarn-integrity

.mocharc.js

@@ -1,7 +1,7 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'test';
 
 module.exports = {
-  require: ['@babel/register'],
+  require: ['./spec/javascripts/support/babel.js'],
   file: 'spec/javascripts/spec_helper.js',
   extension: ['js', 'jsx'],
 };

.rubocop.yml

@@ -15,8 +15,9 @@ AllCops:
     - 'lib/user_flow_exporter.rb'
     - 'node_modules/**/*'
     - 'tmp/**/*'
+    - 'vendor/**/*'
   TargetRubyVersion: 2.6
-  TargetRailsVersion: 5.1
+  TargetRailsVersion: 5.2
   UseCache: true
 
 Rails:
@@ -25,7 +26,7 @@ Rails:
 Metrics/AbcSize:
   Description: A calculated magnitude based on number of assignments, branches, and
     conditions.
-  Enabled: true
+  Enabled: false
   Max: 15
   Exclude:
   - spec/**/*
@@ -45,11 +46,11 @@ Metrics/BlockLength:
 
 Metrics/ClassLength:
   Description: Avoid classes longer than 100 lines of code.
-  Enabled: true
+  Enabled: false
   CountComments: false
   Max: 100
 
-Metrics/LineLength:
+Layout/LineLength:
   Description: Limit lines to 100 characters.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits
   Enabled: true
@@ -64,7 +65,7 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Description: Avoid methods longer than 15 lines of code.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods
-  Enabled: true
+  Enabled: false
   CountComments: false
   Max: 15
   Exclude:
@@ -112,7 +113,7 @@ Rails/TimeZone:
     - strict
     - flexible
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_first_parameter` style aligns the following lines along the same
@@ -195,7 +196,7 @@ Style/IfUnlessModifier:
   Enabled: true
 
 # Checks the indentation of the first element in an array literal.
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   # The value `special_inside_parentheses` means that array literals with
   # brackets that have their opening bracket on the same line as a surrounding
   # opening round parenthesis, shall have their first element indented relative
@@ -282,7 +283,7 @@ Style/TrailingCommaInHashLiteral:
     - consistent_comma
     - no_comma
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   MinNameLength: 2
 
 Style/ExpandPathArguments:
@@ -291,7 +292,6 @@ Style/ExpandPathArguments:
 Style/FormatStringToken:
   Enabled: false
 
-
 Style/SingleLineBlockParams:
   Enabled: false
 
@@ -303,3 +303,51 @@ Naming/MemoizedInstanceVariableName:
 
 Naming/RescuedExceptionsVariableName:
   Enabled: false
+
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
+Lint/SuppressedException:
+  Enabled: false
+
+Lint/SendWithMixinArgument:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: false
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: false
+
+Style/ExponentialNotation:
+  Enabled: false
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: false
+
+Style/SlicingWithRange:
+  Enabled: false
+
+Rails/ApplicationMailer:
+  Enabled: false

CONTRIBUTING.md

@@ -32,13 +32,13 @@ generated by commands like `git merge` and `git revert`.
 add details to help the person reviewing your code understand what your
 pull request is about.
 
-- If the pull request fixes a GitHub issue, mention it at the bottom using
-GitHub's syntax, such as `Fixes #123`.
+- If the pull request is in response to a Jira ticket, include the ticket ID in
+the commit title (e.g. "LG-1234 Add the stuff to the thing")
 
 Example:
 
 ```
-Load seed using before(:suite) in RSpec config
+LG-1235 Load seed using before(:suite) in RSpec config
 
 **Why**:
 - Loading the seed in a `before(:each)` block results in an unnecessary
@@ -50,19 +50,8 @@ and making development less efficient.
 meant to change, and so that only one database call is made.
 - To prevent the data from being wiped out after each spec, configure
 Database Cleaner to ignore those static tables.
-
-Fixes #123
 ```
 
-Note that we use [Overcommit] to enforce some of the commit message rules.
-If this is your first time contributing to this repo, you will need to
-sign your Overcommit configuration by running `overcommit --sign` before
-being able to run `git commit`. See the [Security] section in the Overcommit
-README for more details.
-
-[Overcommit]: https://github.com/brigade/overcommit
-[Security]: https://github.com/brigade/overcommit#security
-
 ### Style, Readability, and OO
 - Rubocop or Reek offenses are not disabled unless they are false positives.
 If you're not sure, please ask a teammate.
@@ -224,4 +213,4 @@ with this waiver of copyright interest.
 [FormResponse]: https://github.com/18F/identity-idp/blob/master/app/services/form_response.rb
 [EmailConfirmationTokenValidator]: https://github.com/18F/identity-idp/blob/master/app/services/email_confirmation_token_validator.rb
 [PasswordForm]: https://github.com/18F/identity-idp/blob/master/app/forms/password_form.rb
-[cache poisoning attacks]: https://github.com/rails/rails/issues/29893
+[cache poisoning attacks]: https://github.com/rails/rails/issues/29893