diff --git a/Gemfile b/Gemfile
index b3afe4e46d..191c63bf26 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
source "https://rubygems.org"
ruby "3.2.2"
-gem "rails", "~> 7.0.8"
+gem "rails", "7.1.0"
gem "after_party" # post-deployment tasks
gem "amazing_print" # easier console reading
diff --git a/Gemfile.lock b/Gemfile.lock
index 6a965bf1a0..0a92815fe0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,74 +1,82 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.0.8)
- actionpack (= 7.0.8)
- activesupport (= 7.0.8)
+ actioncable (7.1.0)
+ actionpack (= 7.1.0)
+ activesupport (= 7.1.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (7.0.8)
- actionpack (= 7.0.8)
- activejob (= 7.0.8)
- activerecord (= 7.0.8)
- activestorage (= 7.0.8)
- activesupport (= 7.0.8)
+ zeitwerk (~> 2.6)
+ actionmailbox (7.1.0)
+ actionpack (= 7.1.0)
+ activejob (= 7.1.0)
+ activerecord (= 7.1.0)
+ activestorage (= 7.1.0)
+ activesupport (= 7.1.0)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
- actionmailer (7.0.8)
- actionpack (= 7.0.8)
- actionview (= 7.0.8)
- activejob (= 7.0.8)
- activesupport (= 7.0.8)
+ actionmailer (7.1.0)
+ actionpack (= 7.1.0)
+ actionview (= 7.1.0)
+ activejob (= 7.1.0)
+ activesupport (= 7.1.0)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
- rails-dom-testing (~> 2.0)
- actionpack (7.0.8)
- actionview (= 7.0.8)
- activesupport (= 7.0.8)
- rack (~> 2.0, >= 2.2.4)
+ rails-dom-testing (~> 2.2)
+ actionpack (7.1.0)
+ actionview (= 7.1.0)
+ activesupport (= 7.1.0)
+ nokogiri (>= 1.8.5)
+ rack (>= 2.2.4)
+ rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (7.0.8)
- actionpack (= 7.0.8)
- activerecord (= 7.0.8)
- activestorage (= 7.0.8)
- activesupport (= 7.0.8)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ actiontext (7.1.0)
+ actionpack (= 7.1.0)
+ activerecord (= 7.1.0)
+ activestorage (= 7.1.0)
+ activesupport (= 7.1.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.0.8)
- activesupport (= 7.0.8)
+ actionview (7.1.0)
+ activesupport (= 7.1.0)
builder (~> 3.1)
- erubi (~> 1.4)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (7.0.8)
- activesupport (= 7.0.8)
+ erubi (~> 1.11)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ activejob (7.1.0)
+ activesupport (= 7.1.0)
globalid (>= 0.3.6)
- activemodel (7.0.8)
- activesupport (= 7.0.8)
+ activemodel (7.1.0)
+ activesupport (= 7.1.0)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
- activerecord (7.0.8)
- activemodel (= 7.0.8)
- activesupport (= 7.0.8)
- activestorage (7.0.8)
- actionpack (= 7.0.8)
- activejob (= 7.0.8)
- activerecord (= 7.0.8)
- activesupport (= 7.0.8)
+ activerecord (7.1.0)
+ activemodel (= 7.1.0)
+ activesupport (= 7.1.0)
+ timeout (>= 0.4.0)
+ activestorage (7.1.0)
+ actionpack (= 7.1.0)
+ activejob (= 7.1.0)
+ activerecord (= 7.1.0)
+ activesupport (= 7.1.0)
marcel (~> 1.0)
- mini_mime (>= 1.1.0)
- activesupport (7.0.8)
+ activesupport (7.1.0)
+ base64
+ bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
+ connection_pool (>= 2.2.5)
+ drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
+ mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
@@ -176,6 +184,8 @@ GEM
activesupport (>= 5.0)
request_store (>= 1.0)
ruby2_keywords
+ drb (2.2.0)
+ ruby2_keywords
email_spec (2.2.2)
htmlentities (~> 4.3.3)
launchy (~> 2.1)
@@ -249,6 +259,10 @@ GEM
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
+ io-console (0.7.1)
+ irb (1.11.0)
+ rdoc
+ reline (>= 0.3.8)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
@@ -289,6 +303,7 @@ GEM
minitest (5.21.1)
multi_xml (0.6.0)
multipart-post (2.3.0)
+ mutex_m (0.2.0)
net-http-persistent (4.0.1)
connection_pool (~> 2.2)
net-imap (0.4.9)
@@ -335,6 +350,8 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
+ psych (5.1.2)
+ stringio
public_suffix (5.0.4)
puma (6.4.2)
nio4r (~> 2.0)
@@ -346,22 +363,27 @@ GEM
rack (>= 1.0, < 4)
rack-cors (2.0.1)
rack (>= 2.0.0)
+ rack-session (1.0.2)
+ rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
- rails (7.0.8)
- actioncable (= 7.0.8)
- actionmailbox (= 7.0.8)
- actionmailer (= 7.0.8)
- actionpack (= 7.0.8)
- actiontext (= 7.0.8)
- actionview (= 7.0.8)
- activejob (= 7.0.8)
- activemodel (= 7.0.8)
- activerecord (= 7.0.8)
- activestorage (= 7.0.8)
- activesupport (= 7.0.8)
+ rackup (1.0.0)
+ rack (< 3)
+ webrick
+ rails (7.1.0)
+ actioncable (= 7.1.0)
+ actionmailbox (= 7.1.0)
+ actionmailer (= 7.1.0)
+ actionpack (= 7.1.0)
+ actiontext (= 7.1.0)
+ actionview (= 7.1.0)
+ activejob (= 7.1.0)
+ activemodel (= 7.1.0)
+ activerecord (= 7.1.0)
+ activestorage (= 7.1.0)
+ activesupport (= 7.1.0)
bundler (>= 1.15.0)
- railties (= 7.0.8)
+ railties (= 7.1.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -373,16 +395,21 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
- railties (7.0.8)
- actionpack (= 7.0.8)
- activesupport (= 7.0.8)
- method_source
+ railties (7.1.0)
+ actionpack (= 7.1.0)
+ activesupport (= 7.1.0)
+ irb
+ rackup (>= 1.0.0)
rake (>= 12.2)
- thor (~> 1.0)
- zeitwerk (~> 2.5)
+ thor (~> 1.0, >= 1.2.2)
+ zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
+ rdoc (6.6.2)
+ psych (>= 4.0.0)
regexp_parser (2.8.1)
+ reline (0.4.1)
+ io-console (~> 0.5)
request_store (1.5.1)
rack (>= 1.4)
responders (3.1.1)
@@ -482,6 +509,7 @@ GEM
rubocop-performance (~> 1.19.1)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
+ stringio (3.1.0)
strong_migrations (1.6.4)
activerecord (>= 5.2)
thor (1.3.0)
@@ -514,6 +542,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
+ webrick (1.8.1)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
@@ -587,7 +616,7 @@ DEPENDENCIES
pundit
rack-attack
rack-cors
- rails (~> 7.0.8)
+ rails (= 7.1.0)
rails-controller-testing
rake
request_store
diff --git a/app/controllers/casa_org_controller.rb b/app/controllers/casa_org_controller.rb
index 115645b78e..8c6199c6c5 100644
--- a/app/controllers/casa_org_controller.rb
+++ b/app/controllers/casa_org_controller.rb
@@ -8,6 +8,7 @@ class CasaOrgController < ApplicationController
before_action :set_sent_emails, only: %i[edit update]
before_action :require_organization!
after_action :verify_authorized
+ before_action :set_active_storage_url_options, only: %i[edit update]
def edit
authorize @casa_org
@@ -82,4 +83,8 @@ def set_sent_emails
def set_learning_hour_topics
@learning_hour_topics = LearningHourTopic.for_organization(@casa_org)
end
+
+ def set_active_storage_url_options
+ ActiveStorage::Current.url_options = {host: request.base_url}
+ end
end
diff --git a/app/views/casa_org/edit.html.erb b/app/views/casa_org/edit.html.erb
index 35da5b82a9..ffe26c074e 100644
--- a/app/views/casa_org/edit.html.erb
+++ b/app/views/casa_org/edit.html.erb
@@ -34,7 +34,8 @@
<% if current_organization.court_report_template.attached? %>
- <%= link_to 'Download Current Template', rails_blob_path(current_organization.court_report_template, only_path: true), class: "btn btn-info" %>
+ <% ActiveStorage::Current.url_options = { host: request.base_url } %>
+ <%= link_to 'Download Current Template', current_organization.court_report_template.url(only_path: true), class: "btn btn-info" %>
<% end %>
diff --git a/bin/setup b/bin/setup
index 48ca1560c8..4f0b54a810 100755
--- a/bin/setup
+++ b/bin/setup
@@ -5,7 +5,7 @@ require "fileutils"
APP_ROOT = File.expand_path("..", __dir__)
def system!(*args)
- system(*args) || abort("\n== Command #{args} failed ==")
+ system(*args, exception: true) || abort("\n== Command #{args} failed ==")
end
FileUtils.chdir APP_ROOT do
diff --git a/config/application.rb b/config/application.rb
index 2487d061c0..082c324eff 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,12 @@
module Casa
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 7.0
+ config.load_defaults 7.1
+
+ # Please, add to the `ignore` list any other `lib` subdirectories that do
+ # not contain `.rb` files, or that should not be reloaded or eager loaded.
+ # Common ones are `templates`, `generators`, or `middleware`, for example.
+ config.autoload_lib(ignore: %w[assets tasks mailers])
# Configuration for the application, engines, and railties goes here.
#
@@ -19,7 +24,8 @@ class Application < Rails::Application
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")
- config.action_mailer.preview_path ||= defined?(Rails.root) ? Rails.root.join("lib", "mailers", "previews") : nil
+ config.action_mailer.preview_paths << (defined?(Rails.root) ? Rails.root.join("lib", "mailers", "previews") : nil)
+
config.eager_load_paths << Rails.root.join("app", "lib", "importers")
config.assets.paths << Rails.root.join("app", "assets", "webfonts")
config.active_storage.variant_processor = :mini_magick
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 29d10dbab1..acd2462967 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,7 +6,7 @@
# In the development environment your application's code is reloaded any time
# it changes. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
- config.cache_classes = false
+ config.enable_reloading = true
# Do not eager load code on boot.
config.eager_load = false
@@ -58,6 +58,9 @@
# Highlight code that triggered database queries in logs.
config.active_record.verbose_query_logs = true
+ # Highlight code that enqueued background job in logs.
+ config.active_job.verbose_enqueue_logs = true
+
# Suppress logger output for asset requests.
config.assets.quiet = true
config.assets.digest = false
@@ -78,4 +81,7 @@
# Uncomment if you wish to allow Action Cable access from any origin.
# config.action_cable.disable_request_forgery_protection = true
config.hosts << ENV["DEV_HOSTS"]
+
+ # Raise error when a before_action's only/except options reference missing actions
+ config.action_controller.raise_on_missing_callback_actions = false
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2ffb28407a..050d32d48b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -18,7 +18,7 @@
enable_starttls_auto: true
}
# Code is not reloaded between requests.
- config.cache_classes = true
+ config.enable_reloading = false
# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both threaded web servers
@@ -30,12 +30,11 @@
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
- # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
- # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+ # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
+ # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
config.require_master_key = true
- # Disable serving static files from the `/public` folder by default since
- # Apache or NGINX already handles this.
+ # Enable static file serving from the `/public` folder (turn off if using NGINX/Apache for it).
config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
# Compress CSS using a preprocessor.
@@ -59,16 +58,26 @@
# config.action_cable.url = "wss://example.com/cable"
# config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
+ # Assume all access to the app is happening through a SSL-terminating reverse proxy.
+ # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
+ # config.assume_ssl = true
+
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = true
- # Include generic and useful information about system operation, but avoid logging too much
- # information to avoid inadvertent exposure of personally identifiable information (PII).
- config.log_level = :info
+ # Log to STDOUT by default
+ config.logger = ActiveSupport::Logger.new($stdout)
+ .tap { |logger| logger.formatter = ::Logger::Formatter.new }
+ .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
# Prepend all log lines with the following tags.
config.log_tags = [:request_id]
+ # Info include generic and useful information about system operation, but avoids logging too much
+ # information to avoid inadvertent exposure of personally identifiable information (PII). If you
+ # want to log everything, set the level to "debug".
+ config.log_level = :info
+
# Use a different cache store in production.
# config.cache_store = :mem_cache_store
@@ -89,19 +98,14 @@
# Don't log any deprecations.
config.active_support.report_deprecations = false
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
-
- # Use a different logger for distributed setups.
- # require "syslog/logger"
- # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
-
- if ENV["RAILS_LOG_TO_STDOUT"].present?
- logger = ActiveSupport::Logger.new($stdout)
- logger.formatter = config.log_formatter
- config.logger = ActiveSupport::TaggedLogging.new(logger)
- end
-
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
+
+ # Enable DNS rebinding protection and other `Host` header attacks.
+ # config.hosts = [
+ # "example.com", # Allow requests from example.com
+ # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+ # ]
+ # Skip DNS rebinding protection for the default health check endpoint.
+ # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 27b3c559b4..8e3f05a654 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -10,13 +10,15 @@
config.action_mailer.default_url_options = {host: "localhost", port: 3000} # for devise authentication
+ # While tests run files are not watched, reloading is not necessary.
+ config.enable_reloading = false
# Turn false under Spring and add config.action_view.cache_template_loading = true.
- config.cache_classes = false
config.action_view.cache_template_loading = true
- # Eager loading loads your whole application. When running a single test locally,
- # this probably isn't necessary. It's a good idea to do in a continuous integration
- # system, or in some way before deploying your code.
+ # Eager loading loads your entire application. When running a single test locally,
+ # this is usually not necessary, and can slow down your test suite. However, it's
+ # recommended that you enable it in continuous integration systems to ensure eager
+ # loading is working properly before deploying your code.
config.eager_load = ENV["CI"].present?
# Configure public file server for tests with Cache-Control for performance.
@@ -31,7 +33,7 @@
# config.cache_store = :null_store
# Raise exceptions instead of rendering exception templates.
- config.action_dispatch.show_exceptions = false
+ config.action_dispatch.show_exceptions = :none
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
@@ -73,4 +75,7 @@
# Annotate rendered view with file names.
# config.action_view.annotate_rendered_view_with_filenames = true
+
+ # Raise error when a before_action's only/except options reference missing actions
+ config.action_controller.raise_on_missing_callback_actions = false
end
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 54f47cf15f..b3076b38fe 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -16,9 +16,9 @@
# # policy.report_uri "/csp-violation-report-endpoint"
# end
#
-# # Generate session nonces for permitted importmap and inline scripts
+# # Generate session nonces for permitted importmap, inline scripts, and inline styles.
# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-# config.content_security_policy_nonce_directives = %w(script-src)
+# config.content_security_policy_nonce_directives = %w(script-src style-src)
#
# # Report violations without enforcing the policy.
# # config.content_security_policy_report_only = true
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 3f261372e0..1fc1105864 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,3 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Avoid CORS issues when API is called from the frontend app.
+# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin Ajax requests.
+
+# Read more: https://github.com/cyu/rack-cors
+
Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do
origins "*" # make sure to change to domain name of frontend
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a7e269e0d3..67d0528ae1 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,6 +10,9 @@
# by default. You can change it below and use your own secret key.
# config.secret_key = 'a42b150b56c158d6e064aa257c8434390c921811007f42c5aa16c7455b78e3777087c5a4bcf18bfb0886fdd9296dec34eaa02fc0b47bed58417347eba971ee2d'
+ # Fixes rspec triggering Rails.application.secrets deprecation warning for Rails 7.1.0 upgrade
+ config.secret_key = Rails.application.secret_key_base
+
# ==> Controller configuration
# Configure the parent class to the devise controllers.
# config.parent_controller = 'DeviseController'
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index adc6568ce8..c2d89e28a2 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-# Configure parameters to be filtered from the log file. Use this to limit dissemination of
-# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
-# notations and behaviors.
+# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
+# Use this to limit dissemination of sensitive information.
+# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
Rails.application.config.filter_parameters += [
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
]
diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
new file mode 100644
index 0000000000..11f69077fc
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_1.rb
@@ -0,0 +1,223 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.1 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.1`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
+# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
+# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
+# of the bootsnap cache if you use it.
+Rails.application.config.add_autoload_paths_to_load_path = false
+
+# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
+# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
+Rails.application.config.action_dispatch.default_headers = {
+ "X-Frame-Options" => "SAMEORIGIN",
+ "X-XSS-Protection" => "0",
+ "X-Content-Type-Options" => "nosniff",
+ "X-Permitted-Cross-Domain-Policies" => "none",
+ "Referrer-Policy" => "strict-origin-when-cross-origin"
+}
+
+# Do not treat an `ActionController::Parameters` instance
+# as equal to an equivalent `Hash` by default.
+Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
+
+# Active Record Encryption now uses SHA-256 as its hash digest algorithm. Important: If you have
+# data encrypted with previous Rails versions, there are two scenarios to consider:
+#
+# 1. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
+# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
+# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
+# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
+# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
+# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
+#
+# If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
+# configure the default behavior starting 7.1+:
+Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
+
+# No longer run after_commit callbacks on the first of multiple Active Record
+# instances to save changes to the same database row within a transaction.
+# Instead, run these callbacks on the instance most likely to have internal
+# state which matches what was committed to the database, typically the last
+# instance to save.
+Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
+
+# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
+#
+# SQLite has some quirks around double-quoted string literals.
+# It first tries to consider double-quoted strings as identifier names, but if they don't exist
+# it then considers them as string literals. Because of this, typos can silently go unnoticed.
+# For example, it is possible to create an index for a non existing column.
+# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
+Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
+
+# Disable deprecated singular associations names
+Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
+
+# Enable the Active Job `BigDecimal` argument serializer, which guarantees
+# roundtripping. Without this serializer, some queue adapters may serialize
+# `BigDecimal` arguments as simple (non-roundtrippable) strings.
+#
+# When deploying an application with multiple replicas, old (pre-Rails 7.1)
+# replicas will not be able to deserialize `BigDecimal` arguments from this
+# serializer. Therefore, this setting should only be enabled after all replicas
+# have been successfully upgraded to Rails 7.1.
+Rails.application.config.active_job.use_big_decimal_serializer = true
+
+# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
+# `write` are given an invalid `expires_at` or `expires_in` time.
+# Options are `true`, and `false`. If `false`, the exception will be reported
+# as `handled` and logged instead.
+Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
+
+# Specify whether Query Logs will format tags using the SQLCommenter format
+# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
+# Options are `:legacy` and `:sqlcommenter`.
+Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
+
+# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
+# instances.
+#
+# The legacy default is `:marshal`, which is a potential vector for
+# deserialization attacks in cases where a message signing secret has been
+# leaked.
+#
+# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
+# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
+# with `Marshal` so that legacy messages can still be read.
+#
+# In Rails 7.2, the default will become `:json` which serializes and
+# deserializes with `ActiveSupport::JSON` only.
+#
+# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
+# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
+# can roundtrip some Ruby types that are not supported by JSON, and may provide
+# improved performance, but it requires the `msgpack` gem.
+#
+# For more information, see
+# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
+#
+# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
+# that have not yet been upgraded must be able to read messages from upgraded
+# servers, first deploy without changing the serializer, then set the serializer
+# in a subsequent deploy.
+Rails.application.config.active_support.message_serializer = :json_allow_marshal
+
+# Enable a performance optimization that serializes message data and metadata
+# together. This changes the message format, so messages serialized this way
+# cannot be read by older versions of Rails. However, messages that use the old
+# format can still be read, regardless of whether this optimization is enabled.
+#
+# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
+# not yet been upgraded must be able to read messages from upgraded servers,
+# leave this optimization off on the first deploy, then enable it on a
+# subsequent deploy.
+Rails.application.config.active_support.use_message_serializer_for_metadata = true
+
+# Set the maximum size for Rails log files.
+#
+# `config.load_defaults 7.1` does not set this value for environments other than
+# development and test.
+#
+if Rails.env.local?
+ Rails.application.config.log_file_size = 100 * 1024 * 1024
+end
+
+# Enable raising on assignment to attr_readonly attributes. The previous
+# behavior would allow assignment but silently not persist changes to the
+# database.
+Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
+
+# Enable validating only parent-related columns for presence when the parent is mandatory.
+# The previous behavior was to validate the presence of the parent record, which performed an extra query
+# to get the parent every time the child record was updated, even when parent has not changed.
+Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
+
+# Enable precompilation of `config.filter_parameters`. Precompilation can
+# improve filtering performance, depending on the quantity and types of filters.
+Rails.application.config.precompile_filter_parameters = true
+
+# Enable before_committed! callbacks on all enrolled records in a transaction.
+# The previous behavior was to only run the callbacks on the first copy of a record
+# if there were multiple copies of the same record enrolled in the transaction.
+Rails.application.config.active_record.before_committed_on_all_records = true
+
+# Disable automatic column serialization into YAML.
+# To keep the historic behavior, you can set it to `YAML`, however it is
+# recommended to explicitly define the serialization method for each column
+# rather than to rely on a global default.
+Rails.application.config.active_record.default_column_serializer = nil
+
+# Enable a performance optimization that serializes Active Record models
+# in a faster and more compact way.
+#
+# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
+# not yet been upgraded must be able to read caches from upgraded servers,
+# leave this optimization off on the first deploy, then enable it on a
+# subsequent deploy.
+Rails.application.config.active_record.marshalling_format_version = 7.1
+
+# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
+# This matches the behaviour of all other callbacks.
+# In previous versions of Rails, they ran in the inverse order.
+Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
+
+# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
+#
+Rails.application.config.active_record.commit_transaction_on_non_local_return = true
+
+# Controls when to generate a value for has_secure_token declarations.
+#
+Rails.application.config.active_record.generate_secure_token_on = :initialize
+
+# ** Please read carefully, this must be configured in config/application.rb **
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 7.0
+# applications.
+# Only change this value after your application is fully deployed to Rails 7.1
+# and you have no plans to rollback.
+# When you're ready to change format, add this to `config/application.rb` (NOT
+# this file):
+# config.active_support.cache_format_version = 7.1
+
+# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
+# platform.
+#
+# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
+# sanitizers if they are supported, else fall back to HTML4 sanitizers.
+#
+# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
+#
+Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+
+# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
+# platform.
+#
+# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
+# sanitizers if they are supported, else fall back to HTML4 sanitizers.
+#
+# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
+#
+Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+
+# Configure the log level used by the DebugExceptions middleware when logging
+# uncaught exceptions during requests
+Rails.application.config.action_dispatch.debug_exception_log_level = :error
+
+# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
+# parsers.
+#
+# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
+#
+# In previous versions of Rails, these test helpers always used an HTML4 parser.
+#
+Rails.application.config.dom_testing_default_html_version = :html5
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
index 00f64d71b0..7db3b9577e 100644
--- a/config/initializers/permissions_policy.rb
+++ b/config/initializers/permissions_policy.rb
@@ -1,11 +1,13 @@
+# Be sure to restart your server when you modify this file.
+
# Define an application-wide HTTP permissions policy. For further
-# information see https://developers.google.com/web/updates/2018/06/feature-policy
-#
-# Rails.application.config.permissions_policy do |f|
-# f.camera :none
-# f.gyroscope :none
-# f.microphone :none
-# f.usb :none
-# f.fullscreen :self
-# f.payment :self, "https://secure.example.com"
+# information see: https://developers.google.com/web/updates/2018/06/feature-policy
+
+# Rails.application.config.permissions_policy do |policy|
+# policy.camera :none
+# policy.gyroscope :none
+# policy.microphone :none
+# policy.usb :none
+# policy.fullscreen :self
+# policy.payment :self, "https://secure.example.com"
# end
diff --git a/spec/models/casa_org_spec.rb b/spec/models/casa_org_spec.rb
index a197ab09e4..fce9d87da2 100644
--- a/spec/models/casa_org_spec.rb
+++ b/spec/models/casa_org_spec.rb
@@ -41,11 +41,17 @@
describe "Attachment" do
it "is valid" do
aggregate_failures do
+ subject = build(:casa_org, twilio_enabled: false)
+
expect(subject.org_logo).to eq(Pathname.new("#{Rails.root}/public/logo.jpeg"))
+
subject.logo.attach(
io: File.open("#{Rails.root}/spec/fixtures/company_logo.png"),
filename: "company_logo.png", content_type: "image/png"
)
+
+ subject.save!
+
expect(subject.logo).to be_an_instance_of(ActiveStorage::Attached::One)
expect(subject.org_logo).to eq("/rails/active_storage/blobs/redirect/#{subject.logo.signed_id}/#{subject.logo.filename}")
end
diff --git a/spec/models/contact_type_group_spec.rb b/spec/models/contact_type_group_spec.rb
index 2dcb7aa2c2..a392533f6b 100644
--- a/spec/models/contact_type_group_spec.rb
+++ b/spec/models/contact_type_group_spec.rb
@@ -1,5 +1,6 @@
require "rails_helper"
-require "contact_type_group"
+# require "contact_type_group"
+require "./app/models/contact_type_group"
RSpec.describe ContactTypeGroup, type: :model do
it "does not have duplicate names" do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 07a625aecb..5164c43fd0 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -49,7 +49,8 @@
end
end
- config.fixture_path = "#{::Rails.root}/spec/fixtures"
+ # Changes to fix warning of Rails 7.1 has deprecated the singular fixture_path in favour of an array
+ config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]
config.use_transactional_fixtures = true
diff --git a/spec/requests/all_casa_admins/dashboard_spec.rb b/spec/requests/all_casa_admins/dashboard_spec.rb
index 291bc6feb4..614d9ba131 100644
--- a/spec/requests/all_casa_admins/dashboard_spec.rb
+++ b/spec/requests/all_casa_admins/dashboard_spec.rb
@@ -17,7 +17,8 @@
it { is_expected.to have_http_status(:success) }
it "shows casa orgs" do
- page = request.parsed_body
+ # Code changes to fix response as earlier HTML String instead of Nokogiri::HTML5::Document object as received in Rails 7.1.0 to pass expectation
+ page = request.parsed_body.to_html
expect(page).to include(*casa_orgs.map(&:name))
end
end
diff --git a/spec/requests/case_contacts/form_spec.rb b/spec/requests/case_contacts/form_spec.rb
index 84fffa0e87..c3d0d99065 100644
--- a/spec/requests/case_contacts/form_spec.rb
+++ b/spec/requests/case_contacts/form_spec.rb
@@ -42,7 +42,7 @@
end
it "shows all contact types once" do
- page = request.parsed_body
+ page = request.parsed_body.to_html
expected_contact_types = [].concat(contact_types_a, contact_types_b).map(&:name)
expected_contact_types.each { |contact_type| expect(page.scan(contact_type).size).to eq(1) }
end
@@ -51,7 +51,7 @@
let!(:casa_case) { create(:casa_case, :with_casa_case_contact_types, casa_org: organization) }
it "shows only contact types assigned to selected casa case" do
- page = request.parsed_body
+ page = request.parsed_body.to_html
expect(page).to include(*casa_case.contact_types.pluck(:name))
expect(page).not_to include(*contact_types_a.pluck(:name))
expect(page).not_to include(*contact_types_b.pluck(:name))
diff --git a/spec/requests/case_contacts_spec.rb b/spec/requests/case_contacts_spec.rb
index 2b2e8d5100..e72425a6e0 100644
--- a/spec/requests/case_contacts_spec.rb
+++ b/spec/requests/case_contacts_spec.rb
@@ -22,7 +22,7 @@
it { is_expected.to have_http_status(:success) }
it "returns all case contacts" do
- page = request.parsed_body
+ page = request.parsed_body.to_html
expect(page).to include(past_contact.creator.display_name, recent_contact.creator.display_name)
end
@@ -30,7 +30,7 @@
let(:filterrific) { {occurred_starting_at: 1.week.ago} }
it "returns all case contacts" do
- page = request.parsed_body
+ page = request.parsed_body.to_html
expect(page).to include(recent_contact.creator.display_name)
expect(page).not_to include(past_contact.creator.display_name)
end
diff --git a/spec/requests/case_court_reports_spec.rb b/spec/requests/case_court_reports_spec.rb
index 0a793308f2..efafbba821 100644
--- a/spec/requests/case_court_reports_spec.rb
+++ b/spec/requests/case_court_reports_spec.rb
@@ -115,7 +115,7 @@
context "when no custom template is set" do
it "sends response as a JSON string", :aggregate_failures do
expect(request.content_type).to eq("application/json; charset=utf-8")
- expect(request.parsed_body).to be_instance_of Hash
+ expect(request.parsed_body).to be_a(ActiveSupport::HashWithIndifferentAccess)
end
it "has keys ['link', 'status'] in JSON string", :aggregate_failures do
@@ -184,7 +184,7 @@
it "sends response as a JSON string", :aggregate_failures do
expect(request.content_type).to eq("application/json; charset=utf-8")
- expect(request.parsed_body).to be_instance_of Hash
+ expect(request.parsed_body).to be_a(ActiveSupport::HashWithIndifferentAccess)
end
it "has keys ['link','status','error_messages'] in JSON string", :aggregate_failures do
diff --git a/spec/requests/users/passwords_spec.rb b/spec/requests/users/passwords_spec.rb
index 15635a47db..f08baf678e 100644
--- a/spec/requests/users/passwords_spec.rb
+++ b/spec/requests/users/passwords_spec.rb
@@ -92,7 +92,7 @@
it "sets errors correctly" do
request
- expect(request.parsed_body).to include("Please enter at least one field.")
+ expect(request.parsed_body.to_html).to include("Please enter at least one field.")
end
end
@@ -101,7 +101,7 @@
it "sets errors correctly" do
request
- expect(request.parsed_body).to include("User does not exist.")
+ expect(request.parsed_body.to_html).to include("User does not exist.")
end
end
diff --git a/spec/requests/volunteers_spec.rb b/spec/requests/volunteers_spec.rb
index 0b2c66c6e6..cfb46c3e9a 100644
--- a/spec/requests/volunteers_spec.rb
+++ b/spec/requests/volunteers_spec.rb
@@ -97,7 +97,7 @@
it "shows correct volunteer", :aggregate_failures do
create(:volunteer, casa_org: organization)
- page = request.parsed_body
+ page = request.parsed_body.to_html
expect(page).to include(volunteer.email)
expect(page).to include(volunteer.display_name)
expect(page).to include(volunteer.phone_number)
@@ -106,7 +106,7 @@
it "shows correct supervisor options", :aggregate_failures do
supervisors = create_list(:supervisor, 3, casa_org: organization)
- page = request.parsed_body
+ page = request.parsed_body.to_html
supervisors.each { |supervisor| expect(page).to include(CGI.escape_html(supervisor.display_name)) }
end
end