From d998cea27f9232a5132ff9c94a42f7efc3b1ea2a Mon Sep 17 00:00:00 2001 From: Jack S Date: Tue, 11 Jul 2023 12:33:39 +0200 Subject: [PATCH] Rebase fix --- .../data_protection_confirmation_banner_component_spec.rb | 2 +- spec/requests/organisations_controller_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/components/data_protection_confirmation_banner_component_spec.rb b/spec/components/data_protection_confirmation_banner_component_spec.rb index a024dc7bb..be10f9689 100644 --- a/spec/components/data_protection_confirmation_banner_component_spec.rb +++ b/spec/components/data_protection_confirmation_banner_component_spec.rb @@ -27,7 +27,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do expect(component.display_banner?).to eq(true) expect(render).to have_link( "Contact helpdesk to assign a data protection officer", - href: "https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21", + href: "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11", ) expect(render).to have_selector("p", text: "To create logs your organisation must state a data protection officer. They must sign the Data Sharing Agreement.") end diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index b64f0ba8a..7ba7be1b2 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -1575,8 +1575,8 @@ RSpec.describe OrganisationsController, type: :request do expect(data_protection_confirmation.organisation_name).to eq(organisation.name) expect(data_protection_confirmation.organisation_address).to eq(organisation.address_row) expect(data_protection_confirmation.organisation_phone_number).to eq(organisation.phone) - expect(data_protection_confirmation.data_protection_officer_email).to eq(current_user.email) - expect(data_protection_confirmation.data_protection_officer_name).to eq(current_user.name) + expect(data_protection_confirmation.data_protection_officer_email).to eq(user.email) + expect(data_protection_confirmation.data_protection_officer_name).to eq(user.name) end context "when the user has already accepted the agreement" do