Use Rails 7.0 application defaults [NDRS2-2253]

config/application.rb

@@ -13,7 +13,7 @@
 module Mbis
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
     #
@@ -70,5 +70,18 @@ class Application < Rails::Application
 
     # TODO: Old Rails 6.0 default; disable this
     ActiveSupport.utc_to_local_returns_utc_offset_times = false
+
+    # TODO: Old Rails 6.1 default; disable this
+    # Fails rails test test/models/concerns/workflow/model_test.rb:180
+    config.active_support.executor_around_test_case = false
+
+    # TODO: Old Rails 6.1 default; disable this
+    # Fixtures are incomplete, e.g. test/fixtures/memberships.yml needs to be defined
+    config.active_record.verify_foreign_keys_for_fixtures = false
+
+    # Old Rails 6.1 default, required by devise_saml_authenticatable version 1.9.1
+    # cf. https://github.com/apokalipto/devise_saml_authenticatable/issues/237
+    # If we don't have this, the redirect when logging out from ADFS throws an application error.
+    Rails.application.config.action_controller.raise_on_open_redirects = false
   end
 end

test/fixtures/project_outputs.yml

@@ -2,8 +2,8 @@
 
 one:
   project: one
-  output: MyString
+  output: one
 
 two:
   project: two
-  output: MyString
+  output: one

test/fixtures/pseudo/death_data.yml

@@ -1,4 +1,5 @@
 death1:
   death_dataid: 1
 # created in ppatients.yml
-  ppatient: patient3
+#  ppatient: patient3
+  ppatient_id: 3

test/fixtures/pseudo/ppatients.yml

@@ -8,20 +8,20 @@ patient1:
 patient2:
   id: 2
   e_batch_id: 1
-  type: Pseudo::Pbirth
+  type: Pseudo::Birth
   pseudo_id1: some_long_id_2_1
   pseudo_id2: ""
 
 patient3:
   id: 3
   e_batch_id: 1
-  type: Pseudo::Pdeath
+  type: Pseudo::Death
   pseudo_id1: some_long_id_3_1
   pseudo_id2: ""
 
 patient4:
   id: 4
   e_batch_id: 1
-  type: Pseudo::Pmolecular
+  type: Pseudo::Molecular
   pseudo_id1: some_long_id_4_1
   pseudo_id2: ""

test/fixtures/pseudo/prescription_data.yml

@@ -6,7 +6,8 @@ prescription1:
   bnf_code: XYZ45
   pat_age: 44
 # created in ppatients.yml
-  ppatient: patient1
+#  ppatient: patient1
+  ppatient_id: 1
 
 prescription2:
   prescription_dataid: 2
@@ -15,4 +16,5 @@ prescription2:
   drug_paid: £99.98
   bnf_code: FML02
   pat_age: 28
-  ppatient: patient1
+#  ppatient: patient1
+  ppatient_id: 1

test/fixtures/users.yml

@@ -298,6 +298,12 @@ delegate_user3:
   division_id: 1
   delegate_user: true
 
+mbis_delegate:
+  email: mbis.delegate@phe.gov.uk
+  first_name: mbis
+  last_name: delegate
+  delegate_user: true
+
 approved_project_user:
   email: approved_project_user@phe.gov.uk
   first_name: Approved