From 4f0ba8a3ad1f95efce312ec6fce72ee94262e6b2 Mon Sep 17 00:00:00 2001 From: Ana Botto Date: Thu, 24 Aug 2023 17:34:08 +0100 Subject: [PATCH 1/4] CW/ACB - Add Russia and Georgia to DATV list, with additonal text --- .../outcomes/_russia_or_georgia.erb | 10 ++++++++++ .../outcome_transit_not_leaving_airport.erb | 4 +++- .../calculators/uk_visa_calculator.rb | 8 ++++++-- test/flows/check_uk_visa_flow_test.rb | 18 ++++++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb diff --git a/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb b/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb new file mode 100644 index 00000000000..a16244067bc --- /dev/null +++ b/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb @@ -0,0 +1,10 @@ +<% if calculator.passport_country_is_russia_or_georgia? %> + ##If you’re arriving in the UK before 5 October 2023 + + You do not need a visa to come to the UK if both of the following apply: + + - you booked and paid for your journey to the UK before 3pm (UK time) on 7 September 2023 + - you’re arriving in the UK before 3pm (UK time) on 5 October 2023 + + You should bring evidence of your onward journey to show to officers at the UK border. +<% end %> diff --git a/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb b/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb index c6364234848..ea9d902ebb8 100644 --- a/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb +++ b/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb @@ -9,7 +9,7 @@ You do not 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) <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %> + - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country) <%= render partial: 'b1_b2_visa_exception', locals: {calculator:} %> - a permanent resident visa issued by Australia or New Zealand - a common format residence permit issued by an European Economic Area (EEA) country or Switzerland - a permanent resident card issued by Canada on or after 28 June 2002 @@ -25,4 +25,6 @@ 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.% + + <%= render partial: 'russia_or_georgia', locals: {calculator:} %> <% end %> diff --git a/lib/smart_answer/calculators/uk_visa_calculator.rb b/lib/smart_answer/calculators/uk_visa_calculator.rb index 0acc48d732b..7486906a5ba 100644 --- a/lib/smart_answer/calculators/uk_visa_calculator.rb +++ b/lib/smart_answer/calculators/uk_visa_calculator.rb @@ -134,6 +134,10 @@ def passport_country_is_macao? @passport_country == "macao" end + def passport_country_is_russia_or_georgia? + %w[russia georgia].include?(@passport_country) + end + def passport_country_is_turkey? @passport_country == "turkey" end @@ -399,7 +403,6 @@ def eligible_for_india_young_professionals_scheme? equatorial-guinea fiji gabon - georgia haiti indonesia jordan @@ -418,7 +421,6 @@ def eligible_for_india_young_professionals_scheme? oman philippines qatar - russia sao-tome-and-principe saudi-arabia stateless-or-refugee @@ -456,6 +458,7 @@ def eligible_for_india_young_professionals_scheme? estonia-alien-passport eswatini ethiopia + georgia ghana guinea guinea-bissau @@ -482,6 +485,7 @@ def eligible_for_india_young_professionals_scheme? north-macedonia pakistan palestinian-territories + russia rwanda senegal serbia diff --git a/test/flows/check_uk_visa_flow_test.rb b/test/flows/check_uk_visa_flow_test.rb index 570f5a6ce40..d06d9666698 100644 --- a/test/flows/check_uk_visa_flow_test.rb +++ b/test/flows/check_uk_visa_flow_test.rb @@ -29,9 +29,11 @@ class CheckUkVisaFlowTest < ActiveSupport::TestCase "israel", "ireland", "estonia", + "georgia", "latvia", "hong-kong", "macao", + "russia", "taiwan", "venezuela", @electronic_travel_authorisation_country, @@ -764,6 +766,22 @@ class CheckUkVisaFlowTest < ActiveSupport::TestCase end end + context "outcome: outcome_transit_not_leaving_airport" do + setup do + testing_node :outcome_transit_not_leaving_airport + add_responses purpose_of_visit?: "transit", + travelling_to_cta?: "somewhere_else", + passing_through_uk_border_control?: "no" + end + + %w[russia georgia].each do |country| + should "render extra guidance for #{country}" do + add_responses what_passport_do_you_have?: country + assert_rendered_outcome text: /If you’re arriving in the UK before 5 October 2023/ + end + end + end + context "outcome: outcome_transit_leaving_airport_direct_airside_transit_visa" do setup do testing_node :outcome_transit_leaving_airport_direct_airside_transit_visa From 3cb0b1a5bfd4b005d0ae22a1aaa3716846ad919c Mon Sep 17 00:00:00 2001 From: Cynthia Anyaeriuba Date: Fri, 1 Sep 2023 14:14:26 +0100 Subject: [PATCH 2/4] CA/AB/SS - Change wording in the outcome_transit_not_leaving_airport.erb file --- .../outcomes/outcome_transit_not_leaving_airport.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb b/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb index ea9d902ebb8..a4f88c4a47e 100644 --- a/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb +++ b/app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb @@ -1,13 +1,13 @@ <% text_for :title do %> - You’ll need a visa to pass through the UK in transit (unless you’re exempt) + You’ll need a visa to pass through the UK in transit <% end %> <% govspeak_for :body do %> - 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. + You normally need a [Direct Airside Transit visa](/transit-visa/direct-airside-transit-visa) if you arrive in the UK on a flight and leave again without passing through immigration control. ##Exemptions - You do not need a visa if you have one of the following: + You do not need a Direct Airside Transit 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) <%= render partial: 'b1_b2_visa_exception', locals: {calculator:} %> - a permanent resident visa issued by Australia or New Zealand From 0b01c6de1ef8149b81d52d796bfd7f084d9ed922 Mon Sep 17 00:00:00 2001 From: Cynthia Anyaeriuba Date: Fri, 1 Sep 2023 14:15:27 +0100 Subject: [PATCH 3/4] CA/AB/SS - Change formatting for _russia_or_georgia.erb --- app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb b/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb index a16244067bc..a2226f9421e 100644 --- a/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb +++ b/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb @@ -1,5 +1,5 @@ <% if calculator.passport_country_is_russia_or_georgia? %> - ##If you’re arriving in the UK before 5 October 2023 + ###If you’re arriving in the UK before 5 October 2023 You do not need a visa to come to the UK if both of the following apply: From 8e1c9b14e73998c398ad09a0b61a42eea8c54c1d Mon Sep 17 00:00:00 2001 From: Chris Whitehouse Date: Mon, 4 Sep 2023 14:28:00 +0100 Subject: [PATCH 4/4] SS/CW - Change content in russia_or_georgia partial --- .../check_uk_visa_flow/outcomes/_russia_or_georgia.erb | 8 ++++---- test/flows/check_uk_visa_flow_test.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb b/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb index a2226f9421e..1371f313d41 100644 --- a/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb +++ b/app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb @@ -1,10 +1,10 @@ <% if calculator.passport_country_is_russia_or_georgia? %> - ###If you’re arriving in the UK before 5 October 2023 + ###If you're arriving in the UK before 6 October 2023 You do not need a visa to come to the UK if both of the following apply: - - you booked and paid for your journey to the UK before 3pm (UK time) on 7 September 2023 - - you’re arriving in the UK before 3pm (UK time) on 5 October 2023 + * you booked and paid for your journey to the UK before 00:01am (UK time) on 8 September 2023 + * you're arriving in the UK before 00:01am (UK time) on 6 October 2023 - You should bring evidence of your onward journey to show to officers at the UK border. + You'll need evidence of your onward journey. You may be asked to show it to Border Force officers or to your airline carrier. <% end %> diff --git a/test/flows/check_uk_visa_flow_test.rb b/test/flows/check_uk_visa_flow_test.rb index d06d9666698..9f02ffd30bb 100644 --- a/test/flows/check_uk_visa_flow_test.rb +++ b/test/flows/check_uk_visa_flow_test.rb @@ -777,7 +777,7 @@ class CheckUkVisaFlowTest < ActiveSupport::TestCase %w[russia georgia].each do |country| should "render extra guidance for #{country}" do add_responses what_passport_do_you_have?: country - assert_rendered_outcome text: /If you’re arriving in the UK before 5 October 2023/ + assert_rendered_outcome text: /If you’re arriving in the UK before 6 October 2023/ end end end