Merge pull request #879 from alphagov/rails-upgrade-v3

Upgrade to rails 7.1.2

Author: callumknights

app/models/publishing_api_manual.rb

@@ -1,6 +1,4 @@
 require "active_model"
-require "struct_with_rendered_markdown"
-require "valid_slug/pattern"
 
 class PublishingAPIManual
   include ActiveModel::Validations
@@ -122,6 +120,6 @@ def incoming_manual_is_valid
   end
 
   def only_known_hmrc_manual_slugs?
-    !HMRCManualsAPI::Application.config.allow_unknown_hmrc_manual_slugs
+    !HmrcManualsApi::Application.config.allow_unknown_hmrc_manual_slugs
   end
 end

app/models/publishing_api_redirected_manual.rb

@@ -1,5 +1,4 @@
 require "active_model"
-require "valid_slug/pattern"
 
 class PublishingAPIRedirectedManual
   include ActiveModel::Validations

app/models/publishing_api_redirected_section.rb

@@ -1,5 +1,4 @@
 require "active_model"
-require "valid_slug/pattern"
 
 class PublishingAPIRedirectedSection
   include ActiveModel::Validations

app/models/publishing_api_removed_manual.rb

@@ -1,5 +1,4 @@
 require "active_model"
-require "valid_slug/pattern"
 
 class PublishingAPIRemovedManual
   include ActiveModel::Validations

app/models/publishing_api_removed_section.rb

@@ -1,5 +1,4 @@
 require "active_model"
-require "valid_slug/pattern"
 
 class PublishingAPIRemovedSection
   include ActiveModel::Validations

app/models/publishing_api_section.rb

@@ -1,6 +1,4 @@
 require "active_model"
-require "struct_with_rendered_markdown"
-require "valid_slug/pattern"
 
 class PublishingAPISection
   include ActiveModel::Validations
@@ -128,6 +126,6 @@ def section_slug_matches_section_id
   end
 
   def only_known_hmrc_manual_slugs?
-    !HMRCManualsAPI::Application.config.allow_unknown_hmrc_manual_slugs
+    !HmrcManualsApi::Application.config.allow_unknown_hmrc_manual_slugs
   end
 end

app/validators/no_dangerous_html_in_text_fields_validator.rb

@@ -1,5 +1,4 @@
 require "govspeak/html_validator"
-require "structured_data"
 
 class NoDangerousHTMLInTextFieldsValidator < ActiveModel::EachValidator
   ALLOWED_IMAGE_HOSTS = [

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)
 end
 
 FileUtils.chdir APP_ROOT do
@@ -17,9 +17,6 @@ FileUtils.chdir APP_ROOT do
   system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
-  puts "\n== Preparing database =="
-  system! "bin/rails db:setup"
-
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 

config/application.rb

@@ -18,11 +18,16 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-module HMRCManualsAPI
+module HmrcManualsApi
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
 
+    # 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])
+
     # Configuration for the application, engines, and railties goes here.
     #
     # These settings can be overridden in specific environments using the files

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
@@ -47,21 +47,17 @@
   # Tell Active Support which deprecation messages to disallow.
   config.active_support.disallowed_deprecation_warnings = []
 
-  # Suppress logger output for asset requests.
-  # config.assets.quiet = true
+  # Highlight code that enqueued background job in logs.
+  config.active_job.verbose_enqueue_logs = true
 
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-
-  # Uncomment if you wish to allow Action Cable access from any origin.
-  # config.action_cable.disable_request_forgery_protection = true
+  # Raise error when a before_action's only/except options reference missing actions
+  config.action_controller.raise_on_missing_callback_actions = true
 
   # Allow requests for all domains e.g. <app>.dev.gov.uk
   config.hosts.clear