Merge pull request #2794 from alphagov/feature/democratic-republic-of…

…-the-congo-slug-change Change slug for democratic-republic-of-the-congo in multiple smartanswers
alphagov · Oct 21, 2016 · 6455c87 · 6455c87
2 parents 97eb005 + d043fe4
commit 6455c87
Show file tree

Hide file tree

Showing 191 changed files with 11,276 additions and 73 deletions.
diff --git a/lib/data/marriage_abroad_services.yml b/lib/data/marriage_abroad_services.yml
@@ -340,13 +340,6 @@ cuba:
       - :receiving_notice_of_marriage
       - :issuing_cni_or_nulla_osta
   payment_partial_name: pay_by_cash_or_credit_card_no_cheque
-democratic-republic-of-congo:
-  opposite_sex:
-    ceremony_country:
-      default:
-      - :receiving_notice_of_marriage
-      - :issuing_cni_or_nulla_osta
-  payment_partial_name: pay_by_cash_or_credit_card_no_cheque
 denmark:
   opposite_sex:
     ceremony_country:
@@ -859,3 +852,9 @@ st-pierre-and-miquelon:
 wallis-and-futuna:
   default:
   - :issuing_custom_and_law_certificate
+democratic-republic-of-the-congo:
+  opposite_sex:
+    ceremony_country:
+      default:
+      - :receiving_notice_of_marriage
+      - :issuing_cni_or_nulla_osta
diff --git a/lib/data/passport_data.yml b/lib/data/passport_data.yml
@@ -477,7 +477,7 @@ congo:
   applying: 10 weeks
   replacing: 8 weeks
   optimistic_processing_time?: false
-democratic-republic-of-congo:
+democratic-republic-of-the-congo:
   type: ips_application_1
   group: ips_documents_group_3
   app_form: hmpo_1_application_form

diff --git a/lib/data/prisoner_packs.yml b/lib/data/prisoner_packs.yml
@@ -119,7 +119,7 @@
   lawyer: /government/publications/colombia-list-of-lawyers
 - slug: comoros
 - slug: congo
-- slug: democratic-republic-of-congo
+- slug: democratic-republic-of-the-congo
   pdf: /government/publications/democratic-republic-of-congo-prisoner-pack
   lawyer: /government/publications/democratic-republic-of-congo-list-of-lawyers
 - slug: costa-rica

diff --git a/lib/data/translators.yml b/lib/data/translators.yml
@@ -17,7 +17,7 @@ bulgaria: /government/publications/bulgaria-list-of-translators
 cape-verde: /government/publications/cape-verde-list-of-lawyers
 chile: /government/publications/chile-list-of-lawyers
 colombia: /government/publications/colombia-list-of-lawyers
-democratic-republic-of-congo: /government/publications/democratic-republic-of-congo-list-of-lawyers
+democratic-republic-of-the-congo: /government/publications/democratic-republic-of-congo-list-of-lawyers
 cuba: /government/publications/cuba-list-of-lawyers
 cyprus: /government/publications/cyprus-list-of-lawyers
 czech-republic: /government/publications/czech-republic-list-of-lawyers

diff --git a/lib/smart_answer/calculators/country_name_formatter.rb b/lib/smart_answer/calculators/country_name_formatter.rb
@@ -1,9 +1,9 @@
 module SmartAnswer::Calculators
   class CountryNameFormatter
-    COUNTRIES_WITH_DEFINITIVE_ARTICLES = %w(bahamas british-virgin-islands cayman-islands czech-republic democratic-republic-of-congo dominican-republic falkland-islands gambia maldives marshall-islands netherlands philippines seychelles solomon-islands south-georgia-and-south-sandwich-islands turks-and-caicos-islands united-arab-emirates)
+    COUNTRIES_WITH_DEFINITIVE_ARTICLES = %w(bahamas british-virgin-islands cayman-islands czech-republic democratic-republic-of-the-congo dominican-republic falkland-islands gambia maldives marshall-islands netherlands philippines seychelles solomon-islands south-georgia-and-south-sandwich-islands turks-and-caicos-islands united-arab-emirates)
 
     FRIENDLY_COUNTRY_NAME = {
-      "democratic-republic-of-congo" => "Democratic Republic of Congo",
+      "democratic-republic-of-the-congo" => "Democratic Republic of the Congo",
       "cote-d-ivoire" => "Cote d'Ivoire",
       "pitcairn" => "Pitcairn Island",
       "south-korea" => "South Korea",

diff --git a/lib/smart_answer/calculators/marriage_abroad_data_query.rb b/lib/smart_answer/calculators/marriage_abroad_data_query.rb
@@ -14,11 +14,11 @@ class MarriageAbroadDataQuery
 
     DUTCH_CARIBBEAN_ISLANDS = %w(aruba bonaire-st-eustatius-saba curacao st-maarten)
 
-    NON_COMMONWEALTH_COUNTRIES = %w(afghanistan albania algeria american-samoa andorra angola anguilla argentina armenia aruba austria azerbaijan bahrain belarus belgium benin bermuda bhutan bolivia bonaire-st-eustatius-saba bosnia-and-herzegovina brazil british-indian-ocean-territory british-virgin-islands bulgaria burkina-faso burma burundi cambodia cape-verde cayman-islands central-african-republic chad chile china colombia comoros congo democratic-republic-of-congo costa-rica cote-d-ivoire croatia cuba curacao czech-republic denmark djibouti dominican-republic ecuador egypt el-salvador equatorial-guinea eritrea estonia ethiopia falkland-islands fiji finland france french-guiana french-polynesia gabon georgia germany gibraltar greece guadeloupe guatemala guinea guinea-bissau haiti honduras hong-kong hungary iceland indonesia iran iraq ireland israel italy japan jordan kazakhstan south-korea kosovo kuwait kyrgyzstan laos latvia lebanon liberia libya liechtenstein lithuania luxembourg macao macedonia madagascar mali marshall-islands martinique mauritania mayotte mexico micronesia moldova monaco mongolia montenegro montserrat morocco nepal netherlands new-caledonia nicaragua niger north-korea norway oman palau panama paraguay peru philippines pitcairn-island poland portugal qatar reunion romania russia rwanda saint-barthelemy san-marino sao-tome-and-principe saudi-arabia senegal serbia slovakia slovenia somalia south-georgia-and-south-sandwich-islands south-sudan spain st-helena-ascension-and-tristan-da-cunha st-maarten st-martin st-pierre-and-miquelon sudan suriname sweden switzerland syria taiwan tajikistan thailand timor-leste togo tunisia turkmenistan turks-and-caicos-islands ukraine united-arab-emirates usa uruguay uzbekistan venezuela wallis-and-futuna western-sahara vietnam yemen zimbabwe)
+    NON_COMMONWEALTH_COUNTRIES = %w(afghanistan albania algeria american-samoa andorra angola anguilla argentina armenia aruba austria azerbaijan bahrain belarus belgium benin bermuda bhutan bolivia bonaire-st-eustatius-saba bosnia-and-herzegovina brazil british-indian-ocean-territory british-virgin-islands bulgaria burkina-faso burma burundi cambodia cape-verde cayman-islands central-african-republic chad chile china colombia comoros congo democratic-republic-of-the-congo costa-rica cote-d-ivoire croatia cuba curacao czech-republic denmark djibouti dominican-republic ecuador egypt el-salvador equatorial-guinea eritrea estonia ethiopia falkland-islands fiji finland france french-guiana french-polynesia gabon georgia germany gibraltar greece guadeloupe guatemala guinea guinea-bissau haiti honduras hong-kong hungary iceland indonesia iran iraq ireland israel italy japan jordan kazakhstan south-korea kosovo kuwait kyrgyzstan laos latvia lebanon liberia libya liechtenstein lithuania luxembourg macao macedonia madagascar mali marshall-islands martinique mauritania mayotte mexico micronesia moldova monaco mongolia montenegro montserrat morocco nepal netherlands new-caledonia nicaragua niger north-korea norway oman palau panama paraguay peru philippines pitcairn-island poland portugal qatar reunion romania russia rwanda saint-barthelemy san-marino sao-tome-and-principe saudi-arabia senegal serbia slovakia slovenia somalia south-georgia-and-south-sandwich-islands south-sudan spain st-helena-ascension-and-tristan-da-cunha st-maarten st-martin st-pierre-and-miquelon sudan suriname sweden switzerland syria taiwan tajikistan thailand timor-leste togo tunisia turkmenistan turks-and-caicos-islands ukraine united-arab-emirates usa uruguay uzbekistan venezuela wallis-and-futuna western-sahara vietnam yemen zimbabwe)
 
-    OS_CONSULAR_CNI_COUNTRIES = %w(albania algeria angola armenia austria azerbaijan bahrain belarus bolivia bosnia-and-herzegovina brazil bulgaria chile croatia cuba democratic-republic-of-congo denmark dominican-republic el-salvador estonia ethiopia georgia germany greece guatemala honduras hungary iceland italy japan jordan kazakhstan kuwait kyrgyzstan latvia libya lithuania luxembourg macedonia mexico moldova montenegro netherlands nepal oman panama poland romania russia serbia slovenia spain sudan sweden tajikistan tunisia turkmenistan uzbekistan venezuela)
+    OS_CONSULAR_CNI_COUNTRIES = %w(albania algeria angola armenia austria azerbaijan bahrain belarus bolivia bosnia-and-herzegovina brazil bulgaria chile croatia cuba democratic-republic-of-the-congo denmark dominican-republic el-salvador estonia ethiopia georgia germany greece guatemala honduras hungary iceland italy japan jordan kazakhstan kuwait kyrgyzstan latvia libya lithuania luxembourg macedonia mexico moldova montenegro netherlands nepal oman panama poland romania russia serbia slovenia spain sudan sweden tajikistan tunisia turkmenistan uzbekistan venezuela)
 
-    OS_NO_CONSULAR_CNI_COUNTRIES = %w(burundi democratic-republic-of-congo mexico saint-barthelemy st-martin)
+    OS_NO_CONSULAR_CNI_COUNTRIES = %w(burundi democratic-republic-of-the-congo mexico saint-barthelemy st-martin)
 
     OS_MARRIAGE_VIA_LOCAL_AUTHORITIES = %w(argentina costa-rica cote-d-ivoire czech-republic israel liberia madagascar netherlands paraguay senegal taiwan ukraine uruguay usa)
 
@@ -54,7 +54,7 @@ class MarriageAbroadDataQuery
 
     SS_UNKNOWN_NO_EMBASSIES = %w(st-martin saint-barthelemy)
 
-    THREE_DAY_RESIDENCY_REQUIREMENT_COUNTRIES = %w(albania algeria angola armenia austria azerbaijan bahrain bolivia bosnia-and-herzegovina bulgaria chile croatia cuba democratic-republic-of-congo denmark dominican-republic el-salvador estonia ethiopia georgia greece guatemala honduras hungary iceland italy kazakhstan kosovo kuwait kyrgyzstan latvia lithuania luxembourg macedonia mexico moldova montenegro nepal panama romania russia serbia slovenia sudan sweden tajikistan tunisia turkmenistan ukraine uzbekistan venezuela)
+    THREE_DAY_RESIDENCY_REQUIREMENT_COUNTRIES = %w(albania algeria angola armenia austria azerbaijan bahrain bolivia bosnia-and-herzegovina bulgaria chile croatia cuba democratic-republic-of-the-congo denmark dominican-republic el-salvador estonia ethiopia georgia greece guatemala honduras hungary iceland italy kazakhstan kosovo kuwait kyrgyzstan latvia lithuania luxembourg macedonia mexico moldova montenegro nepal panama romania russia serbia slovenia sudan sweden tajikistan tunisia turkmenistan ukraine uzbekistan venezuela)
 
     NO_BIRTH_CERT_REQUIREMENT = THREE_DAY_RESIDENCY_REQUIREMENT_COUNTRIES - ['italy']
 

diff --git a/lib/smart_answer/calculators/uk_visa_calculator.rb b/lib/smart_answer/calculators/uk_visa_calculator.rb
@@ -114,7 +114,7 @@ def passing_through_uk_border_control?
 
     COUNTRY_GROUP_VISA_NATIONAL = %w(stateless-or-refugee armenia azerbaijan bahrain benin bhutan bolivia bosnia-and-herzegovina burkina-faso cambodia cape-verde central-african-republic chad colombia comoros cuba djibouti dominican-republic ecuador equatorial-guinea fiji gabon georgia guyana haiti indonesia jordan kazakhstan north-korea kuwait kyrgyzstan laos madagascar mali  montenegro mauritania morocco mozambique niger oman peru philippines qatar russia sao-tome-and-principe saudi-arabia suriname tajikistan taiwan thailand togo tunisia turkmenistan ukraine united-arab-emirates uzbekistan zambia)
 
-    COUNTRY_GROUP_DATV = %w(afghanistan albania algeria angola bangladesh belarus burma burundi cameroon china congo cyprus-north democratic-republic-of-congo egypt eritrea ethiopia gambia ghana guinea guinea-bissau india iran iraq israel-provisional-passport cote-d-ivoire jamaica kenya kosovo lebanon lesotho liberia libya macedonia malawi moldova mongolia nepal nigeria palestinian-territories pakistan rwanda senegal serbia sierra-leone somalia south-africa south-sudan sri-lanka sudan swaziland syria tanzania turkey uganda venezuela vietnam yemen zimbabwe)
+    COUNTRY_GROUP_DATV = %w(afghanistan albania algeria angola bangladesh belarus burma burundi cameroon china congo cyprus-north democratic-republic-of-the-congo egypt eritrea ethiopia gambia ghana guinea guinea-bissau india iran iraq israel-provisional-passport cote-d-ivoire jamaica kenya kosovo lebanon lesotho liberia libya macedonia malawi moldova mongolia nepal nigeria palestinian-territories pakistan rwanda senegal serbia sierra-leone somalia south-africa south-sudan sri-lanka sudan swaziland syria tanzania turkey uganda venezuela vietnam yemen zimbabwe)
 
     COUNTRY_GROUP_EEA = %w(austria belgium bulgaria croatia cyprus czech-republic denmark estonia finland france germany greece hungary iceland ireland italy latvia liechtenstein lithuania luxembourg malta netherlands norway poland portugal romania saint-barthelemy slovakia slovenia spain st-martin sweden switzerland)
 

diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb
@@ -40,7 +40,7 @@
     [Make an appointment at the embassy in Zagreb.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-zagreb/notice-of-marriage-or-civil-partnership/slot_picker)
   <% when 'cuba' %>
     [Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
-  <% when 'democratic-republic-of-congo' %>
+  <% when 'democratic-republic-of-the-congo' %>
     [Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
   <% when 'denmark' %>
     [Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)

diff --git a/script/marriage-abroad-services-updates/opposite_sex_cni.yml b/script/marriage-abroad-services-updates/opposite_sex_cni.yml
@@ -13,7 +13,7 @@
 - chile
 - croatia
 - cuba
-- democratic-republic-of-congo
+- democratic-republic-of-the-congo
 - denmark
 - el-salvador
 - estonia

diff --git a/script/marriage-abroad-services-updates/same_sex_removals.yml b/script/marriage-abroad-services-updates/same_sex_removals.yml
@@ -42,7 +42,7 @@
 - cuba
 - curacao
 - czech-republic
-- democratic-republic-of-congo
+- democratic-republic-of-the-congo
 - djibouti
 - dominica
 - egypt

diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/diplomatic.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/diplomatic.txt
@@ -0,0 +1,14 @@
+Diplomatic Business
+
+You won’t need a visa to come to the UK for a posting or to transit through the UK if you’re going to or returning from a posting in another country. You can still apply for an [exempt vignette](/exempt-vignette).
+
+Your partner or family members [may need a visa to join you](/government/collections/visa-application-forms-diplomats-and-official-visits).
+
+##Government business
+
+You won’t need a visa to come to the UK on official government business for your country if you're a serving government minister. You can still apply for an [exempt vignette](/exempt-vignette).
+
+Your partner or family members [may need a visa to join you](/government/collections/visa-application-forms-diplomats-and-official-visits).
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/family.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/family.txt
@@ -0,0 +1,20 @@
+You’ll need a visa to join your family or partner in the UK
+
+^If you’re visiting family or partner for 6 months or less, you’ll need a [family visit visa](/family-visit-visa).^
+
+The visa you apply for depends on your family member’s situation.
+
+##They’re settled in the UK
+
+Apply for a [‘family of a settled person’ visa](/join-family-in-uk) if your family member or partner is either a British citizen or from outside the European Economic Area (EEA) and settled in the UK.
+
+##They’re working or studying in the UK
+
+You may be able to apply as a ‘dependant’ of [your family member's visa category](/visas-immigration) if they're from outside the EEA and they're working or studying in the UK.
+
+##They’re from the EEA
+
+Apply for a [family permit](/family-permit) to join your family or partner for a short or long stay if they’re living in the UK.
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/marriage.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/marriage.txt
@@ -0,0 +1,10 @@
+You’ll need a visa to come to the UK
+
+
+
+Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
+
+Apply for a [family of a settled person visa](/join-family-in-uk) if your partner is British or settled in the UK and you wish to join them to live in the UK permanently.
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/medical.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/medical.txt
@@ -0,0 +1,6 @@
+You’ll need a visa to visit the UK
+
+You should apply for a [Standard Visitor visa](/standard-visitor-visa).
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/school.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/school.txt
@@ -0,0 +1,6 @@
+You’ll need a visa to visit your child in the UK
+
+You should apply for the [visa for parents](/parent-of-a-child-at-school-visa) visiting children at school.
+
+
+
diff --git a/...artefacts/check-uk-visa/democratic-republic-of-the-congo/study/longer_than_six_months.txt b/...artefacts/check-uk-visa/democratic-republic-of-the-congo/study/longer_than_six_months.txt
@@ -0,0 +1,12 @@
+You’ll need a visa to study in the UK
+
+The visa you apply for depends on your circumstances.
+
+Apply for a [study visa](/tier-4-general-visa) if you’re coming to the UK to study a university or college course for more than 6 months, or more than 11 months if it’s an English language course.
+
+You can apply for a [Short-term Study visa](/study-visit-visa) if you’re 18 or over and studying an English language course for 11 months or less.
+
+You can also apply for a [child study visa](/child-study-visa) if you’re under 18.
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/study/six_months_or_less.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/study/six_months_or_less.txt
@@ -0,0 +1,8 @@
+You’ll need a visa to study in the UK
+
+
+
+Apply for a [Short-term study visa](/study-visit-visa) if you are studying for 6 months or less.
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/tourism.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/tourism.txt
@@ -0,0 +1,6 @@
+You’ll need a visa to come to the UK
+
+Apply for a [Standard Visitor visa](/standard-visitor-visa) if you’re visiting the UK for a holiday or to visit family or friends.
+
+
+
diff --git a/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/transit/no.txt b/test/artefacts/check-uk-visa/democratic-republic-of-the-congo/transit/no.txt
@@ -0,0 +1,27 @@
+You’ll need a visa to pass through the UK in transit (unless you’re exempt)
+
+You should apply for a [Direct Airside Transit visa](/transit-visa) if you arrive in the UK on a flight and leave again without passing through immigration control.
+
+##Exemptions
+
+You don’t need a visa if you have one of the following:
+
+- a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country) 
+- a residence permit issued by Australia or New Zealand
+- you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+- a resident permit issued by Canada after 28 June 2002
+- a uniform format category D visa for entry into a country in the European Economic Area (EEA) or Switzerland
+- an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section)
+- a Schengen Approved Destination Scheme (ADS) group tourism visa where the holder is travelling to to the Schengen country that issued the visa
+- a flight ticket from the Schengen area, if you can prove that you entered the Schengen area in the previous 30 days on the basis of a valid Schengen ADS visa
+- a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+- a valid USA permanent residence card issued by the USA on or after 21 April 1998
+- an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+- a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+All visas and residence permits must be valid.
+
+%E-visas or e-residence permits are not acceptable unless your airline is able to verify it with the issuing country. Contact your airline for more information.%
+
+
+