Run rubocop -a on codebase after 2.6 update. New target is 2.6

Gemfile

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
@@ -36,10 +35,10 @@ gem 'slim-rails'
 ## Use Paper Trail for containing a full history of our edits.
 gem 'action_parameter'
 gem 'aws-sdk-core', '~> 3'
+gem 'aws-sdk-dynamodb', '~> 1.21'
 gem 'aws-sdk-s3', '~> 1.30'
 gem 'aws-sdk-sns', '~> 1.3'
 gem 'aws-sdk-sqs', '~> 1.10'
-gem 'aws-sdk-dynamodb', '~> 1.21'
 gem 'paper_trail', '~> 10.2'
 gem 'paperclip', '~> 6.0'
 gem 'rmagick' # rmagick for image processing
@@ -71,6 +70,7 @@ gem 'uglifier'
 gem 'webpacker', '~> 3.5'
 
 group :development, :test do
+  gem 'byebug'
   gem 'capybara' # Capybara for integration testing
   gem 'database_cleaner'
   gem 'factory_bot_rails'
@@ -80,7 +80,6 @@ group :development, :test do
   gem 'rubocop', '~> 0.66', require: false
   gem 'spring-commands-rspec'
   gem 'vcr'
-  gem 'byebug'
 end
 
 group :development do
@@ -96,7 +95,7 @@ group :test do
   gem 'poltergeist'
   gem 'rails-controller-testing'
   gem 'rspec-json_expectations'
+  gem 'rubocop-rspec'
   gem 'timecop'
   gem 'webmock'
-  gem 'rubocop-rspec'
 end

Rakefile

@@ -3,6 +3,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Rails.application.load_tasks

app/admin/action.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Action do
-  actions :all, except: [:new, :edit]
+  actions :all, except: %i[new edit]
 
   index pagination_total: false
   config.per_page = 20

app/admin/call.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Call do
   actions :index
 

app/admin/campaign.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Campaign do
   permit_params :name, :active
 

app/admin/dashboard.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register_page 'Dashboard' do
   menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
 
@@ -29,5 +30,5 @@
     #     end
     #   end
     # end
-  end # content
+  end
 end

app/admin/donation_band.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register DonationBand do
-  actions :all, except: [:new, :edit]
+  actions :all, except: %i[new edit]
 
   index pagination_total: false
   config.per_page = 20

app/admin/form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Form do
   permit_params :name, :description, :visible, :master
 

app/admin/form_element.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register FormElement do
   permit_params :label, :data_type, :default_value, :required, :visible, :name, :position
 

app/admin/image.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Image do
-  actions :all, except: [:new, :edit, :destroy]
+  actions :all, except: %i[new edit destroy]
 
   index pagination_total: false
   config.per_page = 20

app/admin/language.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Language do
   permit_params :code, :name
   config.filters = false

app/admin/link.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Link do
   permit_params :url, :title, :date, :source, :link_id
 

app/admin/liquid_layout.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register LiquidLayout do
-  actions :all, except: [:new, :edit]
+  actions :all, except: %i[new edit]
 
   index pagination_total: false
   config.per_page = 20

app/admin/liquid_partial.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register LiquidPartial do
-  actions :all, except: [:new, :edit, :destroy]
+  actions :all, except: %i[new edit destroy]
 
   filter :title
   filter :content

app/admin/pages_tag.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register PagesTag do
   permit_params :page_id, :tag_id
 

app/admin/phone_number.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register PhoneNumber do
   actions :all
 

app/admin/tag.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ActiveAdmin.register Tag do
   permit_params :name, :actionkit_uri
 

app/controllers/api/action_confirmations_controller.rb

@@ -5,6 +5,7 @@ class Api::ActionConfirmationsController < ApplicationController
 
   def resend_confirmations
     return head :forbidden unless valid_api_key?
+
     PendingActionService::Reminders.send
 
     head :ok

app/controllers/api/analytics_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::AnalyticsController < ApplicationController
   layout false
 

app/controllers/api/email_target_emails_controller.rb

@@ -18,9 +18,7 @@ def index
       table_name: Settings.dynamodb_mailer_table
     }
 
-    if params[:next]
-      opts[:exclusive_start_key] = JSON.parse(params[:next])
-    end
+    opts[:exclusive_start_key] = JSON.parse(params[:next]) if params[:next]
 
     resp = dynamodb_client.query(opts)
 

app/controllers/api/go_cardless_controller.rb

@@ -55,9 +55,7 @@ def payment_options
       redirect_flow_id: unsafe_params[:redirect_flow_id],
       session_token: session[:go_cardless_session_id]
     }.tap do |options|
-      if unsafe_params[:extra_action_fields].present?
-        options[:extra_params] = unsafe_params[:extra_action_fields]
-      end
+      options[:extra_params] = unsafe_params[:extra_action_fields] if unsafe_params[:extra_action_fields].present?
     end
   end
 

app/controllers/api/members_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::MembersController < ApplicationController
   skip_before_action :verify_authenticity_token, raise: false
 

app/controllers/api/payment/braintree_controller.rb

@@ -34,9 +34,7 @@ def payment_options
       page_id: unsafe_params[:page_id],
       store_in_vault: store_in_vault?
     }.tap do |options|
-      if unsafe_params[:extra_action_fields].present?
-        options[:extra_params] = unsafe_params[:extra_action_fields]
-      end
+      options[:extra_params] = unsafe_params[:extra_action_fields] if unsafe_params[:extra_action_fields].present?
     end
   end
 

app/controllers/api/pension_funds_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::PensionFundsController < ApplicationController
   rescue_from Errno::ENOENT, with: :funds_not_found
 

app/controllers/api/stateless/auth_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     # Api::AuthController allows clients to authenticate and receive a

app/controllers/api/stateless/braintree/payment_methods_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     module Braintree

app/controllers/api/stateless/braintree/subscriptions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     module Braintree

app/controllers/api/stateless/braintree/transactions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     module Braintree

app/controllers/api/stateless/go_cardless/payment_methods_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     module GoCardless

app/controllers/api/stateless/go_cardless/subscriptions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     module GoCardless

app/controllers/api/stateless/go_cardless/transactions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module Stateless
     module GoCardless

app/controllers/api/stateless/location_controller.rb

@@ -14,6 +14,7 @@ def index
       def location
         @location ||= request.location
         raise Api::Exceptions::LocationNotFound unless @location
+
         @location.data
       end
 

app/controllers/api/stateless/stateless_controller.rb

@@ -18,6 +18,7 @@ class StatelessController < ApplicationController
       # Tries token first then falls back to
       def authenticate_request!
         raise Exceptions::UnauthorizedError unless current_member
+
         current_member
       end
 
@@ -29,15 +30,17 @@ def current_member
 
       def authenticate_member_from_token
         return nil if request.headers['authorization'].nil?
+
         _, token = request.headers['authorization'].split
         payload = decode_jwt(token)
         Member.find(payload[:id])
-      rescue
+      rescue StandardError
         raise Exceptions::UnauthorizedError
       end
 
       def authenticate_member_from_cookie
         return nil if cookies.encrypted['authorization'].nil?
+
         payload = decode_jwt(cookies.encrypted['authorization'])
         Member.find(payload[:id])
       end

app/controllers/api/survey_responses_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::SurveyResponsesController < ApplicationController
   skip_before_action :verify_authenticity_token, raise: false
   before_action :localize_from_page_id, only: :create
@@ -23,9 +24,9 @@ def session_manager
   end
 
   def survey_response_params
-    params.
-      to_unsafe_hash.
-      slice(*form.form_elements.map(&:name), 'akid', 'source', 'referring_akid', 'rid', 'referrer_id')
+    params
+      .to_unsafe_hash
+      .slice(*form.form_elements.map(&:name), 'akid', 'source', 'referring_akid', 'rid', 'referrer_id')
   end
 
   def form

app/controllers/campaigns_controller.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 class CampaignsController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_campaign, only: [:show, :edit, :update, :destroy]
+  before_action :find_campaign, only: %i[show edit update destroy]
 
   def index
   end

app/controllers/clone_pages_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ClonePagesController < ApplicationController
   before_action :authenticate_user!
   before_action :find_page

app/controllers/donation_bands_controller.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 class DonationBandsController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_donation_band, only: [:edit, :update]
+  before_action :find_donation_band, only: %i[edit update]
 
   def new
     @donation_band = DonationBand.new

app/controllers/email_confirmation_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class EmailConfirmationController < ApplicationController
   before_action :find_member
 
@@ -18,6 +19,7 @@ def verify
 
   def find_member
     raise ActiveRecord::RecordNotFound if params[:email].blank?
+
     @member = Member.find_by_email!(params[:email])
   end
 end

app/controllers/featured_pages_controller.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 class FeaturedPagesController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_page, only: [:create, :destroy]
+  before_action :find_page, only: %i[create destroy]
 
   def create
     @page.update(featured: true)

app/controllers/forms_controller.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 # TODO: Needs a controller spec
 class FormsController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_form, only: [:show, :edit]
+  before_action :find_form, only: %i[show edit]
 
   def index
   end

app/controllers/home_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class HomeController < ApplicationController
   def index
     if user_signed_in?

app/controllers/images_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ImagesController < ApplicationController
   before_action :authenticate_user!
   before_action :find_page

app/controllers/links_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class LinksController < ApplicationController
   before_action :authenticate_user!