Browse Source

Update links from dluhcdigital to mhclgdigital (#2717)

pull/2722/head^2
Manny Dinssa 2 months ago committed by GitHub
parent
commit
b6f3a24db7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      app/constants/global_constants.rb
  2. 2
      app/helpers/merge_requests_helper.rb
  3. 4
      app/views/content/accessibility_statement.md
  4. 4
      spec/components/data_protection_confirmation_banner_component_spec.rb
  5. 4
      spec/mailers/csv_download_mailer_spec.rb
  6. 2
      spec/requests/organisations_controller_spec.rb
  7. 2
      spec/views/merge_requests/show.html.erb_spec.rb

2
app/constants/global_constants.rb

@ -1,5 +1,5 @@
module GlobalConstants module GlobalConstants
HELPDESK_URL = "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11".freeze HELPDESK_URL = "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11".freeze
COUNTRIES_ANSWER_OPTIONS = { COUNTRIES_ANSWER_OPTIONS = {
"" => "Select an option", "" => "Select an option",

2
app/helpers/merge_requests_helper.rb

@ -9,7 +9,7 @@ module MergeRequestsHelper
def request_details(merge_request) def request_details(merge_request)
[ [
{ label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) }, { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) },
{ label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request_action(merge_request, "helpdesk_ticket") }, { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request_action(merge_request, "helpdesk_ticket") },
{ label: "Status", value: status_tag(merge_request.status) }, { label: "Status", value: status_tag(merge_request.status) },
] ]
end end

4
app/views/content/accessibility_statement.md

@ -32,11 +32,11 @@ If you need information on this website in a different format like accessible PD
We’ll consider your request and get back to you in 2 working days. We’ll consider your request and get back to you in 2 working days.
You can also [contact us through the helpdesk](https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11). You can also [contact us through the helpdesk](https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11).
### Reporting accessibility problems with this website ### Reporting accessibility problems with this website
We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, [contact the helpdesk](https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11). We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, [contact the helpdesk](https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11).
### Enforcement procedure ### Enforcement procedure

4
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(component.display_banner?).to eq(true)
expect(render).to have_link( expect(render).to have_link(
"Contact helpdesk to assign a data protection officer", "Contact helpdesk to assign a data protection officer",
href: "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11", href: "https://mhclgdigital.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.") 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 end
@ -131,7 +131,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
expect(component.display_banner?).to eq(true) expect(component.display_banner?).to eq(true)
expect(render).to have_link( expect(render).to have_link(
"Contact helpdesk to assign a data protection officer", "Contact helpdesk to assign a data protection officer",
href: "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11", href: "https://mhclgdigital.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.") 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 end

4
spec/mailers/csv_download_mailer_spec.rb

@ -42,7 +42,7 @@ RSpec.describe CsvDownloadMailer do
## Missing town or city ## Missing town or city
The town or city in some logs is missing. This data is required in the new version of CORE.\n", The town or city in some logs is missing. This data is required in the new version of CORE.\n",
how_to_fix: "You need to:\n how_to_fix: "You need to:\n
- download [this spreadsheet for lettings logs](#{link}). This link will expire in one week. To request another link, [contact the CORE helpdesk](https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11). - download [this spreadsheet for lettings logs](#{link}). This link will expire in one week. To request another link, [contact the CORE helpdesk](https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11).
- fill in the missing address data - fill in the missing address data
- check that the existing address data is correct\n", - check that the existing address data is correct\n",
duration: "20 minutes", duration: "20 minutes",
@ -70,7 +70,7 @@ In some of your logs, the UPRN is the same as the purchaser code, but these are
If a log has the correct UPRN, leave the UPRN unchanged. If the UPRN is incorrect, clear the value and provide the full address instead. Alternatively, you can change the UPRN on the CORE system.\n", If a log has the correct UPRN, leave the UPRN unchanged. If the UPRN is incorrect, clear the value and provide the full address instead. Alternatively, you can change the UPRN on the CORE system.\n",
how_to_fix: "You need to:\n how_to_fix: "You need to:\n
- download [this spreadsheet for sales logs](#{link}). This link will expire in one week. To request another link, [contact the CORE helpdesk](https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11). - download [this spreadsheet for sales logs](#{link}). This link will expire in one week. To request another link, [contact the CORE helpdesk](https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11).
- check that the address data is correct - check that the address data is correct
- correct any address errors\n", - correct any address errors\n",
duration: "20 minutes", duration: "20 minutes",

2
spec/requests/organisations_controller_spec.rb

@ -497,7 +497,7 @@ RSpec.describe OrganisationsController, type: :request do
it "displays a link to merge organisations" do it "displays a link to merge organisations" do
expect(page).to have_content("To report a merge or update your organisation details, ") expect(page).to have_content("To report a merge or update your organisation details, ")
expect(page).to have_link("contact the helpdesk", href: "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11") expect(page).to have_link("contact the helpdesk", href: "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11")
end end
it "does not display merge history if there is none" do it "does not display merge history if there is none" do

2
spec/views/merge_requests/show.html.erb_spec.rb

@ -30,7 +30,7 @@ RSpec.describe "merge_requests/show.html.erb", type: :view do
it "displays the helpdesk ticket details" do it "displays the helpdesk ticket details" do
expect(rendered).to have_selector("dt", text: "Helpdesk ticket") expect(rendered).to have_selector("dt", text: "Helpdesk ticket")
if merge_request.helpdesk_ticket.present? if merge_request.helpdesk_ticket.present?
expect(rendered).to have_link(merge_request.helpdesk_ticket, href: "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}") expect(rendered).to have_link(merge_request.helpdesk_ticket, href: "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}")
else else
expect(rendered).to have_selector("dd", text: "You didn't answer this question") expect(rendered).to have_selector("dd", text: "You didn't answer this question")
end end

Loading…
Cancel
Save