Merge pull request #2587 from alphagov/update-ww-org-example

Update `formatted_title` for Worldwide Organsation example

content_schemas/examples/worldwide_corporate_information_page/frontend/worldwide_corporate_information_page.json

@@ -101,6 +101,10 @@
           ]
         },
         "details": {
+          "logo": {
+            "crest": "single-identity",
+            "formatted_title": "British Embassy<br/>Manila"
+          },
           "world_location_names": [
             {
               "content_id": "5e9f1506-7706-11e4-a3cb-005056011aef",

content_schemas/examples/worldwide_office/frontend/worldwide_office.json

@@ -149,6 +149,10 @@
           ]
         },
         "details": {
+          "logo": {
+            "crest": "single-identity",
+            "formatted_title": "British Embassy<br/>Manila"
+          },
           "world_location_names": [
             {
               "content_id": "5e9f1506-7706-11e4-a3cb-005056011aef",

content_schemas/examples/worldwide_organisation/frontend/worldwide_organisation.json

@@ -15,7 +15,7 @@
     "body": "<div class=\"govspeak\"><p>Find out more on our UK and India <a rel=\"external\" href=\"https://www.gov.uk/world/india/news\" class=\"govuk-link\">news page</a>.</p>\n\n<p>We provide services to British nationals living in and visiting India. You can access UK government services while in <a rel=\"external\" href=\"https://www.gov.uk/world/india\" class=\"govuk-link\">India</a>.</p>\n\n<h2 id=\"urgent-assistance\">Urgent assistance</h2>\n\n<div class=\"call-to-action\">\n<p>If you’re travelling in India, see our <a rel=\"external\" href=\"https://www.gov.uk/foreign-travel-advice/india\" class=\"govuk-link\">India travel advice</a> about coronavirus (COVID-19).</p>\n\n<p>See also our <a rel=\"external\" href=\"https://www.gov.uk/guidance/travel-advice-novel-coronavirus\" class=\"govuk-link\">coronavirus travel advice</a> for all our latest guidance on travel during coronavirus.</p>\n</div>\n\n<p>If you’re in India and you need advice which is not covered by reading our travel advice then you can <a rel=\"external\" href=\"https://www.contact-embassy.service.gov.uk/?country=India&amp;post=British%20Deputy%20High%20Commission%20Hyderabad\" class=\"govuk-link\">contact us online.</a></p>\n\n<p>If you  need urgent help (for example, you’ve been attacked, arrested or someone has died), call +91 (44) 42192151 or contact us using our <a rel=\"external\" href=\"https://www.contact-embassy.service.gov.uk/?country=India&amp;post=British%20Deputy%20High%20Commission%20Hyderabad\" class=\"govuk-link\">web form</a>. If you’re in the UK and worried about a British person in India, call 020 7008 5000 (24/7, 365 days a year).</p>\n\n<h3 id=\"get-an-emergency-travel-document\">Get an emergency travel document</h3>\n\n<p>You can apply for an <a rel=\"external\" href=\"https://www.gov.uk/emergency-travel-document\" class=\"govuk-link\">emergency travel document</a> if you’re abroad and your passport has been <a rel=\"external\" href=\"https://www.gov.uk/report-a-lost-or-stolen-passport\" class=\"govuk-link\">lost or stolen</a>, damaged or expired, and you can’t <a rel=\"external\" href=\"https://www.gov.uk/renew-adult-passport\" class=\"govuk-link\">get a new or replacement passport</a> in time to travel.</p>\n\n<p><a rel=\"external\" href=\"https://www.gov.uk/emergency-travel-document\" class=\"govuk-link\">Apply online for an emergency travel document</a></p>\n\n<p>If the person needing the emergency travel document is under 16, a parent or guardian should apply on their behalf.</p>\n\n<p>If you are travelling in more than 3 weeks, check if you can <a rel=\"external\" href=\"https://www.gov.uk/renew-adult-passport\" class=\"govuk-link\">get a new or replacement passport</a> in time to travel.</p>\n\n<h3 id=\"if-you-are-not-a-british-citizen-or-have-not-had-a-british-passport-before\">If you are not a British citizen or have not had a British passport before</h3>\n\n<p>If you’re not sure, <a rel=\"external\" href=\"https://www.gov.uk/check-british-citizen\" class=\"govuk-link\">check if you’re a British citizen</a></p>\n\n<p>If you’re not a British citizen but think you may be eligible, <a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commission-hyderabad#contact-us\" class=\"govuk-link\">contact us to apply for an emergency travel document</a>.</p>\n\n<h2 id=\"other-consular-services\">Other consular services</h2>\n\n<h3 id=\"notarial-and-documentary-services\">Notarial and documentary services</h3>\n\n<p>For legal reasons, we’re unable to carry out notarial acts in Commonwealth countries. This includes certifying documents as true copies of originals, administering oaths or taking affidavits. For these or other notarial acts, you should contact a local notary. A standard letter is available to confirm we do not offer these services in India.</p>\n\n<p>See the full list of <a rel=\"external\" href=\"https://www.gov.uk/guidance/notarial-and-documentary-services-guide-for-india\" class=\"govuk-link\">notarial and documentary services</a> we provide in India.</p>\n\n<h3 id=\"consular-fees\">Consular fees</h3>\n\n<p>We charge fees for some of our services. If you are paying in Indian Rupees we can only accept notes that are legal tender, not 500 and 1000 rupee notes that have been withdrawn from circulation. See the <a rel=\"external\" href=\"https://www.gov.uk/government/publications/india-consular-fees\" class=\"govuk-link\">full list of consular fees in India</a>.</p>\n\n<h3 id=\"development-work-in-india\">Development work in India</h3>\n\n<p>Our partnership with India helps enhance investment and trade; increase prosperity and jobs in both countries; strengthen joint action on global issues of mutual concern; widen access to knowledge and technology and support the UK’s global security objectives.</p>\n\n<p>Our targeted and catalytic support is designed to help India address its constraints to growth, accelerate development for the good of all its people and generate a return for Britain by creating new markets for trade and investment.</p>\n\n<p>Find out more in the <a rel=\"external\" href=\"https://www.gov.uk/government/publications/dfid-india-profile-july-2018\" class=\"govuk-link\">country profile for India</a></p>\n\n<p>We also provide services in:</p>\n\n<ul>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commission-ahmedabad\" class=\"govuk-link\">Ahmedabad</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commission-chandigarh\" class=\"govuk-link\">Chandigarh</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commissioner-chennai\" class=\"govuk-link\">Chennai</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commission-bangalore\" class=\"govuk-link\">Bengaluru</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-nationals-assistance-office-goa\" class=\"govuk-link\">Goa</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commission-kolkata\" class=\"govuk-link\">Kolkata</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-deputy-high-commission-mumbai\" class=\"govuk-link\">Mumbai</a></li>\n  <li><a rel=\"external\" href=\"https://www.gov.uk/government/world/organisations/british-high-commission-new-delhi\" class=\"govuk-link\">New Delhi</a></li>\n</ul>\n</div>",
     "logo": {
       "crest": "single-identity",
-      "formatted_title": "British Deputy High Commission \r\nHyderabad"
+      "formatted_title": "British Deputy High Commission<br/>Hyderabad"
     },
     "social_media_links": [
       {

lib/expansion_rules.rb

@@ -111,7 +111,7 @@ def details_fields(*fields)
   TRAVEL_ADVICE_FIELDS = (DEFAULT_FIELDS + details_fields(:country, :change_description)).freeze
   WORLD_LOCATION_FIELDS = %i[content_id title schema_name locale analytics_identifier].freeze
   WORLDWIDE_OFFICE_FIELDS = (DEFAULT_FIELDS + details_fields(:access_and_opening_times)).freeze
-  WORLDWIDE_ORGANISATION_FIELDS = (DEFAULT_FIELDS_AND_DESCRIPTION + details_fields(:world_location_names)).freeze
+  WORLDWIDE_ORGANISATION_FIELDS = (DEFAULT_FIELDS_AND_DESCRIPTION + details_fields(:logo, :world_location_names)).freeze
 
   CUSTOM_EXPANSION_FIELDS_FOR_PEOPLE = (
     %i[

spec/lib/expansion_rules_spec.rb

@@ -58,7 +58,7 @@
     let(:travel_advice_fields) { default_fields + [%i[details country], %i[details change_description]] }
     let(:world_location_fields) { %i[content_id title schema_name locale analytics_identifier] }
     let(:worldwide_office_fields) { default_fields + [%i[details access_and_opening_times]] }
-    let(:worldwide_organisation_fields) { default_fields_and_description + [%i[details world_location_names]] }
+    let(:worldwide_organisation_fields) { default_fields_and_description + [%i[details logo]] + [%i[details world_location_names]] }
 
     specify { expect(rules.expansion_fields(:redirect)).to eq([]) }
     specify { expect(rules.expansion_fields(:gone)).to eq([]) }