resolve merge conflicts

.env.example

@@ -2,6 +2,8 @@
 #
 # ------------------------------------------------------------------------------
 
+VERBOSE=true
+
 # automated queries of secure pages
 BOT_TOKEN=bot
 
@@ -62,9 +64,6 @@ GOOGLE_CLOUD_BUCKET=
 DASHBOARD_UPDATE=y # optional upload activation for local dev
 DASHBOARD_UPDATE_INTERVAL=*/5 * * * *
 
-# alternative content
-TRAINING_MODULES=demo-modules
-
 # Contentful
 CONTENTFUL=true
 # (overrides)

.github/workflows/ci.yml

@@ -30,7 +30,6 @@ jobs:
       RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
       DATABASE_URL: postgres://postgres:password@localhost:5432/test
       DOMAIN: recovery.app
-      TRAINING_MODULES: demo-modules
       BOT_TOKEN: bot_token
 
     services:
@@ -76,24 +75,17 @@ jobs:
       -
         name: Compile assets
         run: bundle exec rails assets:precompile
+      # -
+      #   name: Validate content
+      #   run: bundle exec rails eyfs:cms:validate
       -
-        name: Run rubocop
-        run: bundle exec rubocop
-      -
-        name: Run test suite (YAML)
+        name: Run test suite
         run: bundle exec rspec
-        env:
-          CONTENTFUL: false
       -
-        name: Validate content (CMS)
-        run: bundle exec rails eyfs:cms:validate
-      -
-        name: Run test suite (CMS)
-        run: bundle exec rspec
-
-      # Re-test CMS question response data migration feature
+        name: Run rubocop
+        run: bundle exec rubocop
       # -
-      #   name: Run test suite (CMS)
+      #   name: Run test suite
       #   run: bundle exec rspec
       #   env:
       #     DISABLE_USER_ANSWER: true

.github/workflows/tf-azure-deploy.yml

@@ -63,7 +63,6 @@ env:
   TF_VAR_webapp_config_rails_master_key: ${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }}
   TF_VAR_webapp_config_rails_max_threads: ${{ vars.WEBAPP_CONFIG_RAILS_MAX_THREADS }}
   TF_VAR_webapp_config_rails_serve_static_files: ${{ vars.WEBAPP_CONFIG_RAILS_SERVE_STATIC_FILES }}
-  TF_VAR_webapp_config_training_modules: ${{ vars.WEBAPP_CONFIG_TRAINING_MODULES }}
   TF_VAR_webapp_config_web_concurrency: ${{ vars.WEBAPP_CONFIG_WEB_CONCURRENCY }}
 
 jobs:

.rubocop_todo.yml

@@ -55,16 +55,18 @@ Rails/Output:
     - 'app/jobs/content_check_job.rb'
     - 'app/jobs/fill_page_views_job.rb'
     - 'app/models/concerns/to_csv.rb'
-    - 'app/services/contentful_data_integrity.rb'
+    - 'app/services/content_integrity.rb'
     - 'app/services/dashboard.rb'
 
-# Offense count: 7
+# Offense count: 10
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowImplicitReturn, AllowedReceivers.
 Rails/SaveBang:
   Exclude:
     - 'app/controllers/registrations_controller.rb'
     - 'app/controllers/training/responses_controller.rb'
+    - 'app/forms/users/setting_type_form.rb'
     - 'config/sitemap.rb'
     - 'lib/content_seed.rb'
     - 'lib/seed_images.rb'
+    - 'spec/forms/users/setting_type_form_spec.rb'

Gemfile

@@ -48,9 +48,6 @@ gem 'slim-rails'
 # Headless CMS
 gem 'contentful_rails'
 
-# Create models from static data such as hashes or YAML
-gem 'active_hash'
-
 # TODO: add ey-recovery to https://github.com/DFE-Digital/govuk-components
 gem 'govuk-components'
 gem 'govuk_design_system_formbuilder'
@@ -65,9 +62,6 @@ gem 'govuk_notify_rails'
 gem 'sentry-rails'
 gem 'sentry-ruby'
 
-# Validate and normalise user postcodes
-gem 'uk_postcode'
-
 # Manage seeds
 gem 'dibber'